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: (1436 commits)
  cassini: Use local-mac-address prom property for Cassini MAC address
  net: remove the duplicate #ifdef __KERNEL__
  net: bridge: check the length of skb after nf_bridge_maybe_copy_header()
  netconsole: clarify stopping message
  netconsole: don't announce stopping if nothing happened
  cnic: Fix the type field in SPQ messages
  netfilter: fix export secctx error handling
  netfilter: fix the race when initializing nf_ct_expect_hash_rnd
  ipv4: IP defragmentation must be ECN aware
  net: r6040: Return proper error for r6040_init_one
  dcb: use after free in dcb_flushapp()
  dcb: unlock on error in dcbnl_ieee_get()
  net: ixp4xx_eth: Return proper error for eth_init_one
  include/linux/if_ether.h: Add #define ETH_P_LINK_CTL for HPNA and wlan local tunnel
  net: add POLLPRI to sock_def_readable()
  af_unix: Avoid socket->sk NULL OOPS in stream connect security hooks.
  net_sched: pfifo_head_drop problem
  mac80211: remove stray extern
  mac80211: implement off-channel TX using hw r-o-c offload
  mac80211: implement hardware offload for remain-on-channel
  ...

1 files changed, 30 insertions, 4 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index c5c7292daba0..db1c2b665a42 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -166,9 +166,8 @@ F:	drivers/serial/8250*
 F:      include/linux/serial_8250.h
 
 8390 NETWORK DRIVERS [WD80x3/SMC-ELITE, SMC-ULTRA, NE2000, 3C503, etc.]
-M:      Paul Gortmaker <p_gortmaker@yahoo.com>
 L:      netdev@vger.kernel.org
-S:      Maintained
+S:      Orphan / Obsolete
 F:      drivers/net/*8390*
 F:      drivers/net/ax88796.c
 
@@ -1095,6 +1094,12 @@ S:	Supported
 F:      Documentation/aoe/
 F:      drivers/block/aoe/
 
+ATHEROS ATH GENERIC UTILITIES
+M:      "Luis R. Rodriguez" <lrodriguez@atheros.com>
+L:      linux-wireless@vger.kernel.org
+S:      Supported
+F:      drivers/net/wireless/ath/*
+
 ATHEROS ATH5K WIRELESS DRIVER
 M:      Jiri Slaby <jirislaby@gmail.com>
 M:      Nick Kossifidis <mickflemm@gmail.com>
@@ -1273,6 +1278,15 @@ S:	Maintained
 F:      drivers/video/backlight/
 F:      include/linux/backlight.h
 
+BATMAN ADVANCED
+M:      Marek Lindner <lindner_marek@yahoo.de>
+M:      Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
+M:      Sven Eckelmann <sven@narfation.org>
+L:      b.a.t.m.a.n@lists.open-mesh.org
+W:      http://www.open-mesh.org/
+S:      Maintained
+F:      net/batman-adv/
+
 BAYCOM/HDLCDRV DRIVERS FOR AX.25
 M:      Thomas Sailer <t.sailer@alumni.ethz.ch>
 L:      linux-hams@vger.kernel.org
@@ -3139,6 +3153,8 @@ M:	Alex Duyck <alexander.h.duyck@intel.com>
 M:      John Ronciak <john.ronciak@intel.com>
 L:      e1000-devel@lists.sourceforge.net
 W:      http://e1000.sourceforge.net/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-2.6.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next-2.6.git
 S:      Supported
 F:      Documentation/networking/e100.txt
 F:      Documentation/networking/e1000.txt
@@ -5056,7 +5072,7 @@ L:	linux-wireless@vger.kernel.org
 W:      http://linuxwireless.org/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:      Maintained
-F:      drivers/net/wireless/rtl818x/rtl8180*
+F:      drivers/net/wireless/rtl818x/rtl8180/
 
 RTL8187 WIRELESS DRIVER
 M:      Herton Ronaldo Krzesinski <herton@mandriva.com.br>
@@ -5066,7 +5082,17 @@ L:	linux-wireless@vger.kernel.org
 W:      http://linuxwireless.org/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:      Maintained
-F:      drivers/net/wireless/rtl818x/rtl8187*
+F:      drivers/net/wireless/rtl818x/rtl8187/
+
+RTL8192CE WIRELESS DRIVER
+M:      Larry Finger <Larry.Finger@lwfinger.net>
+M:      Chaoming Li <chaoming_li@realsil.com.cn>
+L:      linux-wireless@vger.kernel.org
+W:      http://linuxwireless.org/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
+S:      Maintained
+F:      drivers/net/wireless/rtlwifi/
+F:      drivers/net/wireless/rtlwifi/rtl8192ce/
 
 S3 SAVAGE FRAMEBUFFER DRIVER
 M:      Antonino Daplas <adaplas@gmail.com>