Merge branch 'master' of master.kernel.org:/pub/scm/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

diff --cc drivers/net/3c503.c
Simple merge

diff --cc drivers/net/arm/ep93xx_eth.c
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/gianfar.c
Simple merge

diff --cc drivers/net/gianfar.h
Simple merge

diff --cc drivers/net/gianfar_ethtool.c
Simple merge

diff --cc drivers/net/igb/igb_main.c
Simple merge

diff --cc drivers/net/netxen/netxen_nic_main.c
Simple merge

diff --cc drivers/net/ppp_async.c
Simple merge

diff --cc drivers/net/pxa168_eth.c
Simple merge

diff --cc drivers/net/r8169.c
Simple merge

diff --cc drivers/net/tun.c
Simple merge

diff --cc drivers/net/wan/farsync.c
Simple merge

diff --cc drivers/net/wireless/iwlegacy/iwl-4965.c
Simple merge

diff --cc drivers/net/wireless/iwlegacy/iwl-dev.h
Simple merge

diff --cc drivers/net/wireless/mwl8k.c
Simple merge

diff --cc drivers/net/wireless/rtlwifi/pci.c
Simple merge

diff --cc drivers/staging/brcm80211/brcmfmac/wl_iw.c
Simple merge

diff --cc include/linux/ethtool.h
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc include/linux/skbuff.h
Simple merge

diff --cc net/8021q/vlan.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/ipv4/af_inet.c
Simple merge

diff --cc net/ipv4/inet_diag.c
Simple merge

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge

diff --cc net/irda/iriap.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_conn.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_core.c
index 2200bae1d4dd59af86af15aafd6568a7ec0480ce,24c28d238dcb62f7dc148648a35e8a05b7278fbc..e33d48cae9fd53b7cdcd6e9e72735ae1c5bc98f2
--- 1/net/netfilter/ipvs/ip_vs_core.c
--- 2/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@@ -1945,7 -1945,8 +1945,8 @@@ static void __net_exit __ip_vs_dev_clea
  {
        EnterFunction(2);
        net_ipvs(net)->enable = 0;      /* Disable packet reception */
 -      __ip_vs_sync_cleanup(net);
+       smp_wmb();
 +      ip_vs_sync_net_cleanup(net);
        LeaveFunction(2);
  }
  

diff --cc net/packet/af_packet.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge