Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Tue, 21 Jun 2011 05:29:08 +0000 (22:29 -0700)]
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:
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1945,7 -1945,8 +1945,8 @@@ static void __net_exit __ip_vs_dev_clea
  {
        EnterFunction(2);
        net_ipvs(net)->enable = 0;      /* Disable packet reception */
+       smp_wmb();
 -      __ip_vs_sync_cleanup(net);
 +      ip_vs_sync_net_cleanup(net);
        LeaveFunction(2);
  }
  
Simple merge
Simple merge