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: (54 commits)
  glge: remove unused #include <version.h>
  dnet: remove unused #include <version.h>
  tcp: miscounts due to tcp_fragment pcount reset
  tcp: add helper for counter tweaking due mid-wq change
  hso: fix for the 'invalid frame length' messages
  hso: fix for crash when unplugging the device
  fsl_pq_mdio: Fix compile failure
  fsl_pq_mdio: Revive UCC MDIO support
  ucc_geth: Pass proper device to DMA routines, otherwise oops happens
  i.MX31: Fixing cs89x0 network building to i.MX31ADS
  tc35815: Fix build error if NAPI enabled
  hso: add Vendor/Product ID's for new devices
  ucc_geth: Remove unused header
  gianfar: Remove unused header
  kaweth: Fix locking to be SMP-safe
  net: allow multiple dev per napi with GRO
  r8169: reset IntrStatus after chip reset
  ixgbe: Fix potential memory leak/driver panic issue while setting up Tx & Rx ring parameters
  ixgbe: fix ethtool -A|a behavior
  ixgbe: Patch to fix driver panic while freeing up tx & rx resources
  ...

1 files changed, 5 insertions, 2 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index b5e278f9fb23..ebaf77ebd8b7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3104,7 +3104,7 @@ M:	shemminger@linux-foundation.org
 L:      netem@lists.linux-foundation.org
 S:      Maintained
 
-NETERION (S2IO) Xframe 10GbE DRIVER
+NETERION (S2IO) 10GbE DRIVER (xframe/vxge)
 P:      Ramkrishna Vepa
 M:      ram.vepa@neterion.com
 P:      Rastapur Santosh
@@ -3113,8 +3113,11 @@ P:	Sivakumar Subramani
 M:      sivakumar.subramani@neterion.com
 P:      Sreenivasa Honnur
 M:      sreenivasa.honnur@neterion.com
+P:      Anil Murthy
+M:      anil.murthy@neterion.com
 L:      netdev@vger.kernel.org
-W:      http://trac.neterion.com/cgi-bin/trac.cgi/wiki/TitleIndex?anonymous
+W:      http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
+W:      http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
 S:      Supported
 
 NETFILTER/IPTABLES/IPCHAINS