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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1443 commits)
  phy/marvell: add 88ec048 support
  igb: Program MDICNFG register prior to PHY init
  e1000e: correct MAC-PHY interconnect register offset for 82579
  hso: Add new product ID
  can: Add driver for esd CAN-USB/2 device
  l2tp: fix export of header file for userspace
  can-raw: Fix skb_orphan_try handling
  Revert "net: remove zap_completion_queue"
  net: cleanup inclusion
  phy/marvell: add 88e1121 interface mode support
  u32: negative offset fix
  net: Fix a typo from "dev" to "ndev"
  igb: Use irq_synchronize per vector when using MSI-X
  ixgbevf: fix null pointer dereference due to filter being set for VLAN 0
  e1000e: Fix irq_synchronize in MSI-X case
  e1000e: register pm_qos request on hardware activation
  ip_fragment: fix subtracting PPPOE_SES_HLEN from mtu twice
  net: Add getsockopt support for TCP thin-streams
  cxgb4: update driver version
  cxgb4: add new PCI IDs
  ...

Manually fix up conflicts in:
 - drivers/net/e1000e/netdev.c: due to pm_qos registration
   infrastructure changes
 - drivers/net/phy/marvell.c: conflict between adding 88ec048 support
   and cleaning up the IDs
 - drivers/net/wireless/ipw2x00/ipw2100.c: trivial ipw2100_pm_qos_req
   conflict (registration change vs marking it static)

1 files changed, 23 insertions, 27 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 33606bb91f1f..7c3b67c34e52 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -313,11 +313,9 @@ S:	Maintained
 F:      drivers/hwmon/adm1029.c
 
 ADM8211 WIRELESS DRIVER
-M:      Michael Wu <flamingice@sourmilk.net>
 L:      linux-wireless@vger.kernel.org
 W:      http://linuxwireless.org/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
-S:      Maintained
+S:      Orphan
 F:      drivers/net/wireless/adm8211.*
 
 ADT746X FAN DRIVER
@@ -1369,7 +1367,7 @@ BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
 M:      Eilon Greenstein <eilong@broadcom.com>
 L:      netdev@vger.kernel.org
 S:      Supported
-F:      drivers/net/bnx2x*
+F:      drivers/net/bnx2x/
 
 BROADCOM TG3 GIGABIT ETHERNET DRIVER
 M:      Matt Carlson <mcarlson@broadcom.com>
@@ -1771,6 +1769,13 @@ W:	http://www.openfabrics.org
 S:      Supported
 F:      drivers/infiniband/hw/cxgb4/
 
+CXGB4VF ETHERNET DRIVER (CXGB4VF)
+M:      Casey Leedom <leedom@chelsio.com>
+L:      netdev@vger.kernel.org
+W:      http://www.chelsio.com
+S:      Supported
+F:      drivers/net/cxgb4vf/
+
 CYBERPRO FB DRIVER
 M:      Russell King <linux@arm.linux.org.uk>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -3686,7 +3691,7 @@ F:	include/linux/mv643xx.h
 MARVELL MWL8K WIRELESS DRIVER
 M:      Lennert Buytenhek <buytenh@wantstofly.org>
 L:      linux-wireless@vger.kernel.org
-S:      Maintained
+S:      Odd Fixes
 F:      drivers/net/wireless/mwl8k.c
 
 MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
@@ -3915,17 +3920,19 @@ L:	netem@lists.linux-foundation.org
 S:      Maintained
 F:      net/sched/sch_netem.c
 
-NETERION (S2IO) 10GbE DRIVER (xframe/vxge)
-M:      Ramkrishna Vepa <ram.vepa@neterion.com>
-M:      Rastapur Santosh <santosh.rastapur@neterion.com>
-M:      Sivakumar Subramani <sivakumar.subramani@neterion.com>
-M:      Sreenivasa Honnur <sreenivasa.honnur@neterion.com>
+NETERION 10GbE DRIVERS (s2io/vxge)
+M:      Ramkrishna Vepa <ramkrishna.vepa@exar.com>
+M:      Sivakumar Subramani <sivakumar.subramani@exar.com>
+M:      Sreenivasa Honnur <sreenivasa.honnur@exar.com>
+M:      Jon Mason <jon.mason@exar.com>
 L:      netdev@vger.kernel.org
 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
 F:      Documentation/networking/s2io.txt
 F:      drivers/net/s2io*
+F:      Documentation/networking/vxge.txt
+F:      drivers/net/vxge/
 
 NETFILTER/IPTABLES/IPCHAINS
 P:      Rusty Russell
@@ -4272,10 +4279,9 @@ F:	include/scsi/osd_*
 F:      fs/exofs/
 
 P54 WIRELESS DRIVER
-M:      Michael Wu <flamingice@sourmilk.net>
+M:      Christian Lamparter <chunkeey@googlemail.com>
 L:      linux-wireless@vger.kernel.org
-W:      http://prism54.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
+W:      http://wireless.kernel.org/en/users/Drivers/p54
 S:      Maintained
 F:      drivers/net/wireless/p54/
 
@@ -4537,7 +4543,7 @@ PRISM54 WIRELESS DRIVER
 M:      "Luis R. Rodriguez" <mcgrof@gmail.com>
 L:      linux-wireless@vger.kernel.org
 W:      http://prism54.org
-S:      Maintained
+S:      Obsolete
 F:      drivers/net/wireless/prism54/
 
 PROMISE DC4030 CACHING DISK CONTROLLER DRIVER
@@ -4733,9 +4739,8 @@ S:	Maintained
 F:      drivers/rapidio/
 
 RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER
-M:      Corey Thomas <coreythomas@charter.net>
 L:      linux-wireless@vger.kernel.org
-S:      Maintained
+S:      Orphan
 F:      drivers/net/wireless/ray*
 
 RCUTORTURE MODULE
@@ -6068,10 +6073,9 @@ F:	Documentation/video4linux/zc0301.txt
 F:      drivers/media/video/zc0301/
 
 USB ZD1201 DRIVER
-M:      Jeroen Vreeken <pe1rxq@amsat.org>
-L:      linux-usb@vger.kernel.org
+L:      linux-wireless@vger.kernel.org
 W:      http://linux-lc100020.sourceforge.net
-S:      Maintained
+S:      Orphan
 F:      drivers/net/wireless/zd1201.*
 
 USB ZR364XX DRIVER
@@ -6259,14 +6263,6 @@ F:	Documentation/watchdog/
 F:      drivers/watchdog/
 F:      include/linux/watchdog.h
 
-WAVELAN NETWORK DRIVER & WIRELESS EXTENSIONS
-M:      Jean Tourrilhes <jt@hpl.hp.com>
-L:      linux-wireless@vger.kernel.org
-W:      http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
-S:      Maintained
-F:      Documentation/networking/wavelan.txt
-F:      drivers/staging/wavelan/
-
 WD7000 SCSI DRIVER
 M:      Miroslav Zagorac <zaga@fly.cc.fer.hr>
 L:      linux-scsi@vger.kernel.org