]> 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>
Wed, 1 Oct 2008 13:12:56 +0000 (06:12 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 1 Oct 2008 13:12:56 +0000 (06:12 -0700)
commit62743c154b50e74408d79192b70e611c5e0bf925
treebf319d78c79bb5cb617ff0c8340c73aa349bba15
parent276beacdc225caf936ad8224a6ff7b1109f4166a
parent368fb4bcc872b98a1b22a09c1fb48d6090731e42
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

drivers/net/wireless/ath9k/core.c
drivers/net/wireless/ath9k/main.c
net/core/dev.c
15 files changed:
Documentation/feature-removal-schedule.txt
MAINTAINERS
drivers/net/bnx2.h
drivers/net/e100.c
drivers/net/forcedeth.c
drivers/net/wireless/ath9k/core.c
drivers/net/wireless/ath9k/core.h
drivers/net/wireless/ath9k/main.c
drivers/net/wireless/ath9k/xmit.c
drivers/net/wireless/b43/rfkill.c
include/net/netlink.h
net/core/dev.c
net/ipv4/tcp_ipv4.c
net/ipv6/route.c
net/ipv6/tcp_ipv6.c