]> pilppa.com Git - linux-2.6-omap-h63xx.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)
commitb262e60309e1b0eb25d300c7e739427d5316abb1
treebf319d78c79bb5cb617ff0c8340c73aa349bba15
parent93c8b90f01f0dc73891da4e84b26524b61d29d66
parent0523820482dcb42784572ffd2296c2f08c275a2b
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