1 files changed, 38 insertions, 4 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 44e659530910..3168d0cbd358 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1120,6 +1120,13 @@ W:	http://wireless.kernel.org/en/users/Drivers/ar9170
 S:      Maintained
 F:      drivers/net/wireless/ath/ar9170/
 
+CARL9170 LINUX COMMUNITY WIRELESS DRIVER
+M:      Christian Lamparter <chunkeey@googlemail.com>
+L:      linux-wireless@vger.kernel.org
+W:      http://wireless.kernel.org/en/users/Drivers/carl9170
+S:      Maintained
+F:      drivers/net/wireless/ath/carl9170/
+
 ATK0110 HWMON DRIVER
 M:      Luca Tettamanti <kronos.it@gmail.com>
 L:      lm-sensors@lm-sensors.org
@@ -1398,6 +1405,13 @@ L:	linux-scsi@vger.kernel.org
 S:      Supported
 F:      drivers/scsi/bfa/
 
+BROCADE BNA 10 GIGABIT ETHERNET DRIVER
+M:      Rasesh Mody <rmody@brocade.com>
+M:      Debashis Dutt <ddutt@brocade.com>
+L:      netdev@vger.kernel.org
+S:      Supported
+F:      drivers/net/bna/
+
 BSG (block layer generic sg v4 driver)
 M:      FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 L:      linux-scsi@vger.kernel.org
@@ -2881,6 +2895,12 @@ M:	Brian King <brking@us.ibm.com>
 S:      Supported
 F:      drivers/scsi/ipr.*
 
+IBM Power Virtual Ethernet Device Driver
+M:      Santiago Leon <santil@linux.vnet.ibm.com>
+L:      netdev@vger.kernel.org
+S:      Supported
+F:      drivers/net/ibmveth.*
+
 IBM ServeRAID RAID DRIVER
 P:      Jack Hammer
 M:      Dave Jeffery <ipslinux@adaptec.com>
@@ -4328,13 +4348,12 @@ F:	Documentation/filesystems/dlmfs.txt
 F:      fs/ocfs2/
 
 ORINOCO DRIVER
-M:      Pavel Roskin <proski@gnu.org>
-M:      David Gibson <hermes@gibson.dropbear.id.au>
 L:      linux-wireless@vger.kernel.org
 L:      orinoco-users@lists.sourceforge.net
 L:      orinoco-devel@lists.sourceforge.net
+W:      http://linuxwireless.org/en/users/Drivers/orinoco
 W:      http://www.nongnu.org/orinoco/
-S:      Maintained
+S:      Orphan
 F:      drivers/net/wireless/orinoco/
 
 OSD LIBRARY and FILESYSTEM
@@ -6400,7 +6419,7 @@ S:	Maintained
 F:      drivers/input/misc/wistron_btns.c
 
 WL1251 WIRELESS DRIVER
-M:      Kalle Valo <kalle.valo@iki.fi>
+M:      Kalle Valo <kvalo@adurom.com>
 L:      linux-wireless@vger.kernel.org
 W:      http://wireless.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
@@ -6415,6 +6434,7 @@ W:	http://wireless.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:      Maintained
 F:      drivers/net/wireless/wl12xx/wl1271*
+F:      include/linux/wl12xx.h
 
 WL3501 WIRELESS PCMCIA CARD DRIVER
 M:      Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
@@ -6559,6 +6579,20 @@ M:	"Maciej W. Rozycki" <macro@linux-mips.org>
 S:      Maintained
 F:      drivers/serial/zs.*
 
+GRE DEMULTIPLEXER DRIVER
+M:      Dmitry Kozlov <xeb@mail.ru>
+L:      netdev@vger.kernel.org
+S:      Maintained
+F:      net/ipv4/gre.c
+F:      include/net/gre.h
+
+PPTP DRIVER
+M:      Dmitry Kozlov <xeb@mail.ru>
+L:      netdev@vger.kernel.org
+S:      Maintained
+F:      drivers/net/pptp.c
+W:      http://sourceforge.net/projects/accel-pptp
+
 THE REST
 M:      Linus Torvalds <torvalds@linux-foundation.org>
 L:      linux-kernel@vger.kernel.org