Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Thu, 28 Jan 2010 14:12:38 +0000 (06:12 -0800)]
18 files changed:
1  2 
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

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge