Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 17 May 2011 21:33:11 +0000 (17:33 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 17 May 2011 21:33:11 +0000 (17:33 -0400)
commit9cbc94eabb0791906051bbfac024ef2c2be8e079
tree41ba194e687c6c60f5c883f98737ac83257d0c00
parent1d1652cbdb9885e4d73972263e4cdbe1b0beebfe
parent7cc31a9ae1477abc79d5992b3afe889f25c50c99
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/vmxnet3/vmxnet3_ethtool.c
net/core/dev.c
16 files changed:
drivers/net/bonding/bond_3ad.h
drivers/net/ehea/ehea_main.c
drivers/net/sfc/nic.c
drivers/net/sfc/nic.h
drivers/net/sfc/siena.c
drivers/net/vmxnet3/vmxnet3_ethtool.c
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/iwlegacy/iwl-core.c
drivers/net/wireless/iwlegacy/iwl-dev.h
drivers/net/wireless/libertas/cmd.c
net/bridge/br_netfilter.c
net/core/dev.c
net/core/ethtool.c
net/mac80211/tx.c
net/netfilter/ipvs/ip_vs_ctl.c
net/socket.c