Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/bnx2x/bnx2x.h

diff --cc MAINTAINERS
index 0d83e589823363d1b29e7acab510ad2289f3bf96,6d1814857a584bf867c4a61944bbbd432d9d30a2..75760e796ae32b3e67c370aa710abc173aa7a1bf
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/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>

diff --cc drivers/bluetooth/btusb.c
Simple merge

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

diff --cc drivers/net/bnx2x/bnx2x_cmn.c
Simple merge

diff --cc drivers/net/bnx2x/bnx2x_cmn.h
Simple merge

diff --cc drivers/net/bnx2x/bnx2x_ethtool.c
Simple merge

diff --cc drivers/net/bnx2x/bnx2x_main.c
Simple merge

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

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

diff --cc drivers/net/e1000e/netdev.c
Simple merge

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

diff --cc drivers/net/sfc/ethtool.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/mac.c
Simple merge

diff --cc include/net/ipv6.h
Simple merge

diff --cc include/net/sch_generic.h
Simple merge

diff --cc kernel/irq/manage.c
Simple merge

diff --cc net/dcb/dcbnl.c
Simple merge

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

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

diff --cc net/mac80211/iface.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_ctl.c
index c73b0c831a2d0b68fb441c1e23f84dc22dc19ee8,ba98e1308f3ced1a19414259285d2bdba2f37fd3..d69ec26b6bd4741a4fa92a07a407b4b2ffe1f650
--- 1/net/netfilter/ipvs/ip_vs_ctl.c
--- 2/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@@ -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);
  

diff --cc net/netfilter/nf_log.c
Simple merge

diff --cc net/netlink/af_netlink.c
Simple merge

diff --cc net/sched/sch_generic.c
index a854cab03f1e31ec8fb938d19a4b8e6562a63ad9,1bc698039ae2e647d670d53b83b976858cdf2a09..c84b65920d1b7962abe5aeb4ff222a75be21c82c
--- 1/net/sched/sch_generic.c
--- 2/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@@ -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,

diff --cc net/wireless/wext-compat.c
Simple merge