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: (47 commits)
  [SCTP]: Fix local_addr deletions during list traversals.
  net: fix build with CONFIG_NET=n
  [TCP]: Prevent sending past receiver window with TSO (at last skb)
  rt2x00: Add new D-Link USB ID
  rt2x00: never disable multicast because it disables broadcast too
  libertas: fix the 'compare command with itself' properly
  drivers/net/Kconfig: fix whitespace for GELIC_WIRELESS entry
  [NETFILTER]: nf_queue: don't return error when unregistering a non-existant handler
  [NETFILTER]: nfnetlink_queue: fix EPERM when binding/unbinding and instance 0 exists
  [NETFILTER]: nfnetlink_log: fix EPERM when binding/unbinding and instance 0 exists
  [NETFILTER]: nf_conntrack: replace horrible hack with ksize()
  [NETFILTER]: nf_conntrack: add \n to "expectation table full" message
  [NETFILTER]: xt_time: fix failure to match on Sundays
  [NETFILTER]: nfnetlink_log: fix computation of netlink skb size
  [NETFILTER]: nfnetlink_queue: fix computation of allocated size for netlink skb.
  [NETFILTER]: nfnetlink: fix ifdef in nfnetlink_compat.h
  [NET]: include <linux/types.h> into linux/ethtool.h for __u* typedef
  [NET]: Make /proc/net a symlink on /proc/self/net (v3)
  RxRPC: fix rxrpc_recvmsg()'s returning of msg_name
  net/enc28j60: oops fix
  ...

1 files changed, 4 insertions, 28 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 25f450fe105..0f95a4a787a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2052,43 +2052,19 @@ M:	kernel@wantstofly.org
 L:      netdev@vger.kernel.org
 S:      Maintained
 
-INTEL PRO/100 ETHERNET SUPPORT
+INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/ixgb/ixgbe)
 P:      Auke Kok
 M:      auke-jan.h.kok@intel.com
 P:      Jesse Brandeburg
 M:      jesse.brandeburg@intel.com
 P:      Jeff Kirsher
 M:      jeffrey.t.kirsher@intel.com
+P:      Bruce Allan
+M:      bruce.w.allan@intel.com
 P:      John Ronciak
 M:      john.ronciak@intel.com
 L:      e1000-devel@lists.sourceforge.net
-W:      http://sourceforge.net/projects/e1000/
-S:      Supported
-
-INTEL PRO/1000 GIGABIT ETHERNET SUPPORT
-P:      Auke Kok
-M:      auke-jan.h.kok@intel.com
-P:      Jesse Brandeburg
-M:      jesse.brandeburg@intel.com
-P:      Jeff Kirsher
-M:      jeffrey.t.kirsher@intel.com
-P:      John Ronciak
-M:      john.ronciak@intel.com
-L:      e1000-devel@lists.sourceforge.net
-W:      http://sourceforge.net/projects/e1000/
-S:      Supported
-
-INTEL PRO/10GbE SUPPORT
-P:      Ayyappan Veeraiyan
-M:      ayyappan.veeraiyan@intel.com
-P:      Auke Kok
-M:      auke-jan.h.kok@intel.com
-P:      Jesse Brandeburg
-M:      jesse.brandeburg@intel.com
-P:      John Ronciak
-M:      john.ronciak@intel.com
-L:      e1000-devel@lists.sourceforge.net
-W:      http://sourceforge.net/projects/e1000/
+W:      http://e1000.sourceforge.net/
 S:      Supported
 
 INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT