]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit1528ab8bf029174e5b9743d22ae7d3c47c1e8013
tree89cfe21911e1539e1b7f89d8a10d42abecba2a18
parent8326aa4970f95a46e5226d1e67caa395da4a46be
parent13a508ec77d3073ce350e9886c10b1881f9991d4
Merge branch 'master' of master.kernel.org:/pub/scm/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