1 files changed, 51 insertions, 6 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 7c5d32916d1c..5a546e594567 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -627,6 +627,11 @@ P:	Haavard Skinnemoen
 M:      hskinnemoen@atmel.com
 S:      Supported
 
+ATMEL SPI DRIVER
+P:      Haavard Skinnemoen
+M:      hskinnemoen@atmel.com
+S:      Supported
+
 ATMEL WIRELESS DRIVER
 P:      Simon Kelley
 M:      simon@thekelleys.org.uk
@@ -642,6 +647,12 @@ W:	http://people.redhat.com/sgrubb/audit/
 T:      git kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6.git
 S:      Maintained
 
+AUXILIARY DISPLAY DRIVERS
+P:      Miguel Ojeda Sandonis
+M:      maxextreme@gmail.com
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+
 AVR32 ARCHITECTURE
 P:      Haavard Skinnemoen
 M:      hskinnemoen@atmel.com
@@ -843,6 +854,18 @@ L:	linux-kernel@vger.kernel.org
 L:      discuss@x86-64.org
 S:      Maintained
 
+CFAG12864B LCD DRIVER
+P:      Miguel Ojeda Sandonis
+M:      maxextreme@gmail.com
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+
+CFAG12864BFB LCD FRAMEBUFFER DRIVER
+P:      Miguel Ojeda Sandonis
+M:      maxextreme@gmail.com
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+
 COMMON INTERNET FILE SYSTEM (CIFS)
 P:      Steve French
 M:      sfrench@samba.org
@@ -991,14 +1014,12 @@ L:	cycsyn-devel@bazar.conectiva.com.br
 S:      Maintained
 
 CYCLADES ASYNC MUX DRIVER
-M:      async@cyclades.com
 W:      http://www.cyclades.com/
-S:      Supported
+S:      Orphan
 
 CYCLADES PC300 DRIVER
-M:      pc300@cyclades.com
 W:      http://www.cyclades.com/
-S:      Supported
+S:      Orphan
 
 DAMA SLAVE for AX.25
 P:      Joerg Reuter
@@ -1121,7 +1142,7 @@ S:	Supported
 DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
 P:      Tobias Ringstrom
 M:      tori@unhappy.mine.nu
-L:      linux-kernel@vger.kernel.org
+L:      netdev@vger.kernel.org
 S:      Maintained
 
 DOCBOOK FOR DOCUMENTATION
@@ -1978,6 +1999,12 @@ M:	davem@davemloft.net
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
+KS0108 LCD CONTROLLER DRIVER
+P:      Miguel Ojeda Sandonis
+M:      maxextreme@gmail.com
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+
 LAPB module
 L:      linux-x25@vger.kernel.org
 S:      Orphan
@@ -2368,7 +2395,7 @@ S:	Maintained
 NETWORKING [WIRELESS]
 P:      John W. Linville
 M:      linville@tuxdriver.com
-L:      netdev@vger.kernel.org
+L:      linux-wireless@vger.kernel.org
 T:      git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 S:      Maintained
 
@@ -2508,6 +2535,12 @@ M:	olof@lixom.net
 L:      netdev@vger.kernel.org
 S:      Maintained
 
+PA SEMI SMBUS DRIVER
+P:      Olof Johansson
+M:      olof@lixom.net
+L:      i2c@lm-sensors.org
+S:      Maintained
+
 PARALLEL PORT SUPPORT
 P:      Phil Blundell
 M:      philb@gnu.org
@@ -3044,6 +3077,12 @@ M:	perex@suse.cz
 L:      alsa-devel@alsa-project.org
 S:      Maintained
 
+SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT
+P:      Liam Girdwood
+M:      liam.girdwood@wolfsonmicro.com
+L:      alsa-devel@alsa-project.org
+S:      Supported
+
 SPI SUBSYSTEM
 P:      David Brownell
 M:      dbrownell@users.sourceforge.net
@@ -3294,6 +3333,11 @@ L:	vtun@office.satix.net
 W:      http://vtun.sourceforge.net/tun
 S:      Maintained
 
+TURBOCHANNEL SUBSYSTEM
+P:      Maciej W. Rozycki
+M:      macro@linux-mips.org
+S:      Maintained
+
 U14-34F SCSI DRIVER
 P:      Dario Ballabio
 M:      ballabio_dario@emc.com
@@ -3742,6 +3786,7 @@ P:	Andi Kleen
 M:      ak@suse.de
 L:      discuss@x86-64.org
 W:      http://www.x86-64.org
+T:      quilt ftp://ftp.firstfloor.org/pub/ak/x86_64/quilt-current
 S:      Maintained
 
 YAM DRIVER FOR AX.25