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: (56 commits)
  netns: Fix crash by making igmp per namespace
  bnx2x: Version update
  bnx2x: Checkpatch compliance
  bnx2x: Spelling mistakes
  bnx2x: Minor code improvements
  bnx2x: Driver info
  bnx2x: 1G LED does not turn off
  bnx2x: 8073 PHY changes
  bnx2x: Change GPIO for any port
  bnx2x: Pause settings
  bnx2x: Link order with external PHY
  bnx2x: No LRO without Rx checksum
  bnx2x: Wrong structure size
  bnx2x: WoL capability
  bnx2x: Clearing MAC addresses filters
  bnx2x: Delay in while loops
  bnx2x: PBA Table Page Alignment Workaround
  bnx2x: Self-test false positive
  bnx2x: Memory allocation
  bnx2x: HW attention lock
  ...

diff --combined MAINTAINERS
index af6aa4e4b39264313d8b2fa0dc59820877ab2600,45b26e78bbcda618305b697b2ef79137e75e7b80..e5610b275b22a698678abef8926b00d034b8192a
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -594,11 -594,6 +594,11 @@@ M:       kernel@wantstofly.or
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
  S:    Maintained
  
 +ARM/MAGICIAN MACHINE SUPPORT
 +P:    Philipp Zabel
 +M:    philipp.zabel@gmail.com
 +S:    Maintained
 +
  ARM/TOSA MACHINE SUPPORT
  P:    Dmitry Baryshkov
  M:    dbaryshkov@gmail.com
@@@ -1249,7 -1244,7 +1249,7 @@@ S:      Maintaine
  CPU FREQUENCY DRIVERS
  P:    Dave Jones
  M:    davej@codemonkey.org.uk
 -L:    cpufreq@lists.linux.org.uk
 +L:    cpufreq@vger.kernel.org
  W:    http://www.codemonkey.org.uk/projects/cpufreq/
  T:    git kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git
  S:    Maintained
@@@ -2462,7 -2457,7 +2462,7 @@@ L:      kernel-janitors@vger.kernel.or
  W:    http://www.kerneljanitors.org/
  S:    Maintained
  
 -KERNEL NFSD
 +KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
  P:    J. Bruce Fields
  M:    bfields@fieldses.org
  P:    Neil Brown
@@@ -3076,9 -3071,10 +3076,10 @@@ M:    horms@verge.net.a
  P:    Julian Anastasov
  M:    ja@ssi.bg
  L:    netdev@vger.kernel.org
+ L:    lvs-devel@vger.kernel.org
  S:    Maintained
  
 -NFS CLIENT
 +NFS, SUNRPC, AND LOCKD CLIENTS
  P:    Trond Myklebust
  M:    Trond.Myklebust@netapp.com
  L:    linux-nfs@vger.kernel.org
@@@ -4683,6 -4679,12 +4684,6 @@@ L:     linux-wireless@vger.kernel.or
  L:    zd1211-devs@lists.sourceforge.net (subscribers-only)
  S:    Maintained
  
 -ZF MACHZ WATCHDOG
 -P:    Fernando Fuganti
 -M:    fuganti@netbank.com.br
 -W:    http://cvs.conectiva.com.br/drivers/ZFL-watchdog/
 -S:    Maintained
 -
  ZR36067 VIDEO FOR LINUX DRIVER
  P:    Ronald Bultje
  M:    rbultje@ronald.bitfreak.net