Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Fri, 30 Oct 2009 04:28:59 +0000 (21:28 -0700)]
16 files changed:
1  2 
MAINTAINERS
drivers/net/bonding/bond_main.c
drivers/net/cnic.c
drivers/net/qlge/qlge.h
drivers/net/qlge/qlge_main.c
drivers/net/qlge/qlge_mpi.c
drivers/net/sfc/rx.c
drivers/net/virtio_net.c
drivers/net/wireless/airo.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/libertas/if_spi.c
net/ipv4/raw.c
net/mac80211/mlme.c
net/packet/af_packet.c
net/wireless/mlme.c
net/wireless/sme.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/raw.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge