Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (42 commits)
  MAINTAINERS: Add Andy Gospodarek as co-maintainer.
  r8169: disable ASPM
  RxRPC: Fix v1 keys
  AF_RXRPC: Handle receiving ACKALL packets
  cnic: Fix lost interrupt on bnx2x
  cnic: Prevent status block race conditions with hardware
  net: dcbnl: check correct ops in dcbnl_ieee_set()
  e1000e: disable broken PHY wakeup for ICH10 LOMs, use MAC wakeup instead
  igb: fix sparse warning
  e1000: fix sparse warning
  netfilter: nf_log: avoid oops in (un)bind with invalid nfproto values
  dccp: fix oops on Reset after close
  ipvs: fix dst_lock locking on dest update
  davinci_emac: Add Carrier Link OK check in Davinci RX Handler
  bnx2x: update driver version to 1.62.00-6
  bnx2x: properly calculate lro_mss
  bnx2x: perform statistics "action" before state transition.
  bnx2x: properly configure coefficients for MinBW algorithm (NPAR mode).
  bnx2x: Fix ethtool -t link test for MF (non-pmf) devices.
  bnx2x: Fix nvram test for single port devices.
  ...

diff --combined MAINTAINERS
index 8afba63,a9784a6..6d18148
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -885,7 -885,7 +885,7 @@@ S: Supporte
  
  ARM/QUALCOMM MSM MACHINE SUPPORT
  M:    David Brown <davidb@codeaurora.org>
 -M:    Daniel Walker <dwalker@codeaurora.org>
 +M:    Daniel Walker <dwalker@fifo99.com>
  M:    Bryan Huntsman <bryanh@codeaurora.org>
  L:    linux-arm-msm@vger.kernel.org
  F:    arch/arm/mach-msm/
@@@ -1467,6 -1467,7 +1467,7 @@@ F:      include/net/bluetooth
  
  BONDING DRIVER
  M:    Jay Vosburgh <fubar@us.ibm.com>
+ M:    Andy Gospodarek <andy@greyhouse.net>
  L:    netdev@vger.kernel.org
  W:    http://sourceforge.net/projects/bonding/
  S:    Supported
@@@ -1692,13 -1693,6 +1693,13 @@@ 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:    Vasanthy Kolluri <vkolluri@cisco.com>
  M:    Roopa Prabhu <roprabhu@cisco.com>
@@@ -2033,7 -2027,7 +2034,7 @@@ F:      Documentation/scsi/dc395x.tx
  F:    drivers/scsi/dc395x.*
  
  DCCP PROTOCOL
- M:    Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
+ M:    Gerrit Renker <gerrit@erg.abdn.ac.uk>
  L:    dccp@vger.kernel.org
  W:    http://www.linuxfoundation.org/collaborate/workgroups/networking/dccp
  S:    Maintained
@@@ -2880,6 -2874,7 +2881,6 @@@ M:      Guenter Roeck <guenter.roeck@ericsso
  L:    lm-sensors@lm-sensors.org
  W:    http://www.lm-sensors.org/
  T:    quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/
 -T:    quilt kernel.org/pub/linux/kernel/people/groeck/linux-staging/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
  S:    Maintained
  F:    Documentation/hwmon/
@@@ -5273,7 -5268,7 +5274,7 @@@ S:      Maintaine
  F:    drivers/net/wireless/rtl818x/rtl8180/
  
  RTL8187 WIRELESS DRIVER
 -M:    Herton Ronaldo Krzesinski <herton@mandriva.com.br>
 +M:    Herton Ronaldo Krzesinski <herton@canonical.com>
  M:    Hin-Tak Leung <htl10@users.sourceforge.net>
  M:    Larry Finger <Larry.Finger@lwfinger.net>
  L:    linux-wireless@vger.kernel.org
@@@ -6111,7 -6106,7 +6112,7 @@@ S:      Maintaine
  F:    security/tomoyo/
  
  TOPSTAR LAPTOP EXTRAS DRIVER
 -M:    Herton Ronaldo Krzesinski <herton@mandriva.com.br>
 +M:    Herton Ronaldo Krzesinski <herton@canonical.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    drivers/platform/x86/topstar-laptop.c