Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Fri, 4 Mar 2011 05:27:42 +0000 (21:27 -0800)]
Conflicts:
drivers/net/bnx2x/bnx2x.h

25 files changed:
1  2 
MAINTAINERS
drivers/bluetooth/btusb.c
drivers/net/bnx2x/bnx2x.h
drivers/net/bnx2x/bnx2x_cmn.c
drivers/net/bnx2x/bnx2x_cmn.h
drivers/net/bnx2x/bnx2x_ethtool.c
drivers/net/bnx2x/bnx2x_main.c
drivers/net/cnic.c
drivers/net/dm9000.c
drivers/net/e1000e/netdev.c
drivers/net/fec.c
drivers/net/sfc/ethtool.c
drivers/net/wireless/ath/ath9k/mac.c
include/net/ipv6.h
include/net/sch_generic.h
kernel/irq/manage.c
net/dcb/dcbnl.c
net/ipv4/tcp_input.c
net/ipv6/route.c
net/mac80211/iface.c
net/netfilter/ipvs/ip_vs_ctl.c
net/netfilter/nf_log.c
net/netlink/af_netlink.c
net/sched/sch_generic.c
net/wireless/wext-compat.c

diff --cc MAINTAINERS
@@@ -1692,8 -1693,14 +1693,15 @@@ M:    Andy Whitcroft <apw@canonical.com
  S:    Supported
  F:    scripts/checkpatch.pl
  
+ CHINESE DOCUMENTATION
+ M:    Harry Wei <harryxiyou@gmail.com>
+ L:    xiyoulinuxkernelgroup@googlegroups.com
+ L:    linux-kernel@zh-kernel.org (moderated for non-subscribers)
+ S:    Maintained
+ F:    Documentation/zh_CN/
  CISCO VIC ETHERNET NIC DRIVER
 +M:    Christian Benvenuti <benve@cisco.com>
  M:    Vasanthy Kolluri <vkolluri@cisco.com>
  M:    Roopa Prabhu <roprabhu@cisco.com>
  M:    David Wang <dwang2@cisco.com>
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/dcb/dcbnl.c
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -769,12 -808,12 +769,12 @@@ __ip_vs_update_dest(struct ip_vs_servic
        dest->u_threshold = udest->u_threshold;
        dest->l_threshold = udest->l_threshold;
  
-       spin_lock(&dest->dst_lock);
+       spin_lock_bh(&dest->dst_lock);
        ip_vs_dst_reset(dest);
-       spin_unlock(&dest->dst_lock);
+       spin_unlock_bh(&dest->dst_lock);
  
        if (add)
 -              ip_vs_new_estimator(&dest->stats);
 +              ip_vs_new_estimator(svc->net, &dest->stats);
  
        write_lock_bh(&__ip_vs_svc_lock);
  
Simple merge
Simple merge
@@@ -844,8 -839,8 +844,9 @@@ void dev_deactivate(struct net_device *
  
        list_add(&dev->unreg_list, &single);
        dev_deactivate_many(&single);
+       list_del(&single);
  }
 +EXPORT_SYMBOL(dev_deactivate);
  
  static void dev_init_scheduler_queue(struct net_device *dev,
                                     struct netdev_queue *dev_queue,
Simple merge