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: (1429 commits)
  net: Allow dependancies of FDDI & Tokenring to be modular.
  igb: Fix build warning when DCA is disabled.
  net: Fix warning fallout from recent NAPI interface changes.
  gro: Fix potential use after free
  sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
  sfc: When disabling the NIC, close the device rather than unregistering it
  sfc: SFT9001: Add cable diagnostics
  sfc: Add support for multiple PHY self-tests
  sfc: Merge top-level functions for self-tests
  sfc: Clean up PHY mode management in loopback self-test
  sfc: Fix unreliable link detection in some loopback modes
  sfc: Generate unique names for per-NIC workqueues
  802.3ad: use standard ethhdr instead of ad_header
  802.3ad: generalize out mac address initializer
  802.3ad: initialize ports LACPDU from const initializer
  802.3ad: remove typedef around ad_system
  802.3ad: turn ports is_individual into a bool
  802.3ad: turn ports is_enabled into a bool
  802.3ad: make ntt bool
  ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
  ...

Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).

1 files changed, 35 insertions, 13 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 701025701514..08d0ab7fa161 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -742,7 +742,7 @@ M:	jirislaby@gmail.com
 P:      Nick Kossifidis
 M:      mickflemm@gmail.com
 P:      Luis R. Rodriguez
-M:      mcgrof@gmail.com
+M:      lrodriguez@atheros.com
 P:      Bob Copeland
 M:      me@bobcopeland.com
 L:      linux-wireless@vger.kernel.org
@@ -1607,11 +1607,6 @@ L:	acpi4asus-user@lists.sourceforge.net
 W:      http://sourceforge.net/projects/acpi4asus
 S:      Maintained
 
-EEPRO100 NETWORK DRIVER
-P:      Andrey V. Savochkin
-M:      saw@saw.sw.com.sg
-S:      Maintained
-
 EFS FILESYSTEM
 W:      http://aeschi.ch.eu.org/efs/
 S:      Orphan
@@ -1849,7 +1844,7 @@ P:	Haavard Skinnemoen
 M:      hskinnemoen@atmel.com
 S:      Supported
 
-GENERIC HDLC DRIVER, N2, C101, PCI200SYN and WANXL DRIVERS
+GENERIC HDLC (WAN) DRIVERS
 P:      Krzysztof Halasa
 M:      khc@pm.waw.pl
 W:      http://www.kernel.org/pub/linux/utils/net/hdlc/
@@ -2248,6 +2243,11 @@ M:	dan.j.williams@intel.com
 L:      linux-kernel@vger.kernel.org
 S:      Supported
 
+INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
+P:      Krzysztof Halasa
+M:      khc@pm.waw.pl
+S:      Maintained
+
 INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
 P:      Deepak Saxena
 M:      dsaxena@plexity.net
@@ -3614,16 +3614,26 @@ L:	linux-hams@vger.kernel.org
 W:      http://www.linux-ax25.org/
 S:      Maintained
 
-RTL818X WIRELESS DRIVER
-P:      Michael Wu
-M:      flamingice@sourmilk.net
-P:      Andrea Merello
-M:      andreamrl@tiscali.it
+RTL8180 WIRELESS DRIVER
+P:      John W. Linville
+M:      linville@tuxdriver.com
 L:      linux-wireless@vger.kernel.org
 W:      http://linuxwireless.org/
-T:      git kernel.org:/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
+T:      git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:      Maintained
 
+RTL8187 WIRELESS DRIVER
+P:       Herton Ronaldo Krzesinski
+M:      herton@mandriva.com.br
+P:      Hin-Tak Leung
+M       htl10@users.sourceforge.net
+P:      Larry Finger
+M:      Larry.Finger@lwfinger.net
+L:      linux-wireless@vger.kernel.org
+W:      http://linuxwireless.org/
+T:      git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-testing.git
+S:      Maintained
+
 S3 SAVAGE FRAMEBUFFER DRIVER
 P:      Antonino Daplas
 M:      adaplas@gmail.com
@@ -3913,6 +3923,18 @@ M:	mhoffman@lightlink.com
 L:      lm-sensors@lm-sensors.org
 S:      Maintained
 
+SMSC911x ETHERNET DRIVER
+P:      Steve Glendinning
+M:      steve.glendinning@smsc.com
+L:      netdev@vger.kernel.org
+S:      Supported
+
+SMSC9420 PCI ETHERNET DRIVER
+P:      Steve Glendinning
+M:      steve.glendinning@smsc.com
+L:      netdev@vger.kernel.org
+S:      Supported
+
 SMX UIO Interface
 P:      Ben Nizette
 M:      bn@niasdigital.com