Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 18 Apr 2008 06:56:30 +0000 (23:56 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 18 Apr 2008 06:56:30 +0000 (23:56 -0700)
commit1e42198609d73ed1a9adcba2af275c24c2678420
tree32fd4d9073bfc0f3909af8f9fb4bcff38951d01a
parent794eb6bf20ebf992c040ea831cd3a9c64b0c1f7a
parent4b119e21d0c66c22e8ca03df05d9de623d0eb50f
Merge branch 'master' of /linux/kernel/git/torvalds/linux-2.6
17 files changed:
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