Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 30 Oct 2009 04:28:59 +0000 (21:28 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 30 Oct 2009 04:28:59 +0000 (21:28 -0700)
commit0519d83d83ed485b5a1f9222ff69d7d6c9bb8a01
tree2e336be8a4bd2e59bcd4b69b00feb77c6672a9cb
parent38bfd8f5bec496e8e0db8849e01c99a33479418a
parentb5dd884e682cae6b8c037f9d11f3b623b4cf2011
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
16 files changed:
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