Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 28 Jan 2010 14:12:38 +0000 (06:12 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 28 Jan 2010 14:12:38 +0000 (06:12 -0800)
commit05ba712d7eb156009753e18e5116cabd869cc6e2
tree1ad850d6889f6b3671a5636653940f20a7d22bdf
parent257ddbdad13cd3c4f7d03b85af632c508aa8abc9
parentb473946a0853860e13b51c28add5524741117786
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
18 files changed:
MAINTAINERS
drivers/net/benet/be_cmds.c
drivers/net/benet/be_cmds.h
drivers/net/bonding/bond_main.c
drivers/net/e1000/e1000_main.c
drivers/net/e1000e/netdev.c
drivers/net/igb/igb_main.c
drivers/net/igbvf/netdev.c
drivers/net/ixgbe/ixgbe_main.c
drivers/net/qlge/qlge_main.c
drivers/net/sky2.c
drivers/net/starfire.c
drivers/net/tulip/tulip_core.c
drivers/net/virtio_net.c
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/main.c
net/8021q/vlan_dev.c
net/mac80211/driver-trace.h