Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
David S. Miller [Fri, 18 Apr 2008 06:56:30 +0000 (23:56 -0700)]
17 files changed:
1  2 
MAINTAINERS
drivers/net/fec_mpc52xx.c
drivers/net/fec_mpc52xx_phy.c
drivers/net/ps3_gelic_wireless.c
drivers/net/smc91x.h
drivers/net/wireless/b43/dma.c
drivers/net/wireless/b43legacy/main.c
drivers/net/wireless/rtl8187_dev.c
drivers/ssb/main.c
include/linux/ssb/ssb.h
net/ipv4/ipconfig.c
net/ipv4/tcp_input.c
net/mac80211/rx.c
net/rxrpc/ar-internal.h
net/sched/sch_api.c
net/sunrpc/clnt.c
security/selinux/ss/services.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge