Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/fec_mpc52xx.c
Simple merge

diff --cc drivers/net/fec_mpc52xx_phy.c
Simple merge

diff --cc drivers/net/ps3_gelic_wireless.c
Simple merge

diff --cc drivers/net/smc91x.h
Simple merge

diff --cc drivers/net/wireless/b43/dma.c
Simple merge

diff --cc drivers/net/wireless/b43legacy/main.c
Simple merge

diff --cc drivers/net/wireless/rtl8187_dev.c
Simple merge

diff --cc drivers/ssb/main.c
Simple merge

diff --cc include/linux/ssb/ssb.h
Simple merge

diff --cc net/ipv4/ipconfig.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/mac80211/rx.c
Simple merge

diff --cc net/rxrpc/ar-internal.h
Simple merge

diff --cc net/sched/sch_api.c
Simple merge

diff --cc net/sunrpc/clnt.c
Simple merge

diff --cc security/selinux/ss/services.c
Simple merge