Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 17 Nov 2009 08:05:02 +0000 (00:05 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 17 Nov 2009 08:05:02 +0000 (00:05 -0800)
commita2bfbc072e279ff81e6b336acff612b9bc2e5281
tree89cfe21911e1539e1b7f89d8a10d42abecba2a18
parent5c427ff9e4cc61625d48172ea082ae99e21eea6a
parent82b3cc1a2f5e46300a9dec4a8cc8106dc20a4c23
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/can/Kconfig
13 files changed:
MAINTAINERS
drivers/net/can/Kconfig
drivers/net/can/dev.c
drivers/net/davinci_emac.c
drivers/net/ixgbe/ixgbe_main.c
drivers/net/r8169.c
drivers/net/smsc911x.c
drivers/net/wireless/ipw2x00/ipw2200.c
net/bluetooth/l2cap.c
net/core/dev.c
net/ipv4/ipmr.c
net/ipv4/tcp.c
net/sctp/socket.c