Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Sat, 23 Jan 2010 08:31:06 +0000 (00:31 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 23 Jan 2010 08:31:06 +0000 (00:31 -0800)
commit51c24aaacaea90c8e87f1dec75a2ac7622b593f8
tree9f54936c87764bef75e97395cb56b7d1e0df24c6
parent4276e47e2d1c85a2477caf0d22b91c4f2377fba8
parent6be325719b3e54624397e413efd4b33a997e55a3
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
38 files changed:
Documentation/feature-removal-schedule.txt
MAINTAINERS
drivers/net/e1000/e1000_main.c
drivers/net/e1000e/e1000.h
drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/netdev.c
drivers/net/igbvf/netdev.c
drivers/net/ixgb/ixgb_main.c
drivers/net/ixgbe/Makefile
drivers/net/ixgbe/ixgbe.h
drivers/net/ixgbe/ixgbe_82599.c
drivers/net/ixgbe/ixgbe_common.c
drivers/net/ixgbe/ixgbe_ethtool.c
drivers/net/ixgbe/ixgbe_main.c
drivers/net/ixgbe/ixgbe_type.h
drivers/net/mlx4/main.c
drivers/net/s2io.c
drivers/net/sky2.c
drivers/net/tg3.c
drivers/net/tg3.h
drivers/net/ucc_geth.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl-5000.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/iwlwifi/iwl-devtrace.c
drivers/net/wireless/iwlwifi/iwl-devtrace.h
drivers/net/wireless/p54/p54pci.c
drivers/net/wireless/zd1211rw/zd_usb.c
lib/vsprintf.c
net/ipv4/route.c
net/mac80211/cfg.c
net/mac80211/iface.c
net/mac80211/mlme.c
net/mac80211/rx.c
net/packet/af_packet.c
net/wireless/core.c
net/wireless/sme.c