From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 14 Aug 2008 03:48:46 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.27-rc4~103
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=7a49efae71397cf7e9299bbb22b2d12f7cf12428;p=linux-2.6-omap-h63xx.git

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
  ...
---

7a49efae71397cf7e9299bbb22b2d12f7cf12428
diff --cc MAINTAINERS
index af6aa4e4b39,45b26e78bbc..e5610b275b2
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -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