Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 21 Jun 2011 05:29:08 +0000 (22:29 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 21 Jun 2011 05:29:08 +0000 (22:29 -0700)
commit9f6ec8d697c08963d83880ccd35c13c5ace716ea
treead8d93cf6fcdd09b86ade09f5fcbbc66cdb1cca2
parent4aa3a715551c93eda32d79bd52042ce500bd5383
parent56299378726d5f2ba8d3c8cbbd13cb280ba45e4f
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/rtlwifi/pci.c
net/netfilter/ipvs/ip_vs_core.c
33 files changed:
drivers/net/3c503.c
drivers/net/arm/ep93xx_eth.c
drivers/net/bonding/bond_main.c
drivers/net/gianfar.c
drivers/net/gianfar.h
drivers/net/gianfar_ethtool.c
drivers/net/igb/igb_main.c
drivers/net/netxen/netxen_nic_main.c
drivers/net/ppp_async.c
drivers/net/pxa168_eth.c
drivers/net/r8169.c
drivers/net/tun.c
drivers/net/wan/farsync.c
drivers/net/wireless/iwlegacy/iwl-4965.c
drivers/net/wireless/iwlegacy/iwl-dev.h
drivers/net/wireless/mwl8k.c
drivers/net/wireless/rtlwifi/pci.c
drivers/staging/brcm80211/brcmfmac/wl_iw.c
include/linux/ethtool.h
include/linux/netdevice.h
include/linux/skbuff.h
net/8021q/vlan.c
net/core/dev.c
net/ipv4/af_inet.c
net/ipv4/inet_diag.c
net/ipv4/route.c
net/ipv4/tcp_ipv4.c
net/ipv6/tcp_ipv6.c
net/irda/iriap.c
net/netfilter/ipvs/ip_vs_conn.c
net/netfilter/ipvs/ip_vs_core.c
net/packet/af_packet.c
net/wireless/nl80211.c