1 files changed, 55 insertions, 5 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index a0b125bed4d3..c4e5b5dec154 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1106,6 +1106,12 @@ M:	kernel@wantstofly.org
 L:      linux-usb@vger.kernel.org
 S:      Maintained
 
+CIRRUS LOGIC CS4270 SOUND DRIVER
+P:      Timur Tabi
+M:      timur@freescale.com
+L:      alsa-devel@alsa-project.org
+S:      Supported
+
 CIRRUS LOGIC CS4280/CS461x SOUNDDRIVER
 P:      Cirrus Logic Corporation (kernel 2.2 driver)
 M:      Cirrus Logic Corporation, Thomas Woller <twoller@crystal.cirrus.com>
@@ -1628,6 +1634,12 @@ L:	linuxppc-dev@ozlabs.org
 L:      netdev@vger.kernel.org
 S:      Maintained
 
+FREESCALE QUICC ENGINE LIBRARY
+P:      Timur Tabi
+M:      timur@freescale.com
+L:      linuxppc-dev@ozlabs.org
+S:      Supported
+
 FREESCALE HIGHSPEED USB DEVICE DRIVER
 P:      Li Yang
 M:      leoli@freescale.com
@@ -1642,6 +1654,19 @@ L:	netdev@vger.kernel.org
 L:      linuxppc-dev@ozlabs.org
 S:      Maintained
 
+FREESCALE QUICC ENGINE UCC UART DRIVER
+P:      Timur Tabi
+M:      timur@freescale.com
+L:      linuxppc-dev@ozlabs.org
+S:      Supported
+
+FREESCALE SOC SOUND DRIVERS
+P:      Timur Tabi
+M:      timur@freescale.com
+L:      alsa-devel@alsa-project.org
+L:      linuxppc-dev@ozlabs.org
+S:      Supported
+
 FILE LOCKING (flock() and fcntl()/lockf())
 P:      Matthew Wilcox
 M:      matthew@wil.cx
@@ -2304,6 +2329,13 @@ L:	kvm-devel@lists.sourceforge.net
 W:      kvm.sourceforge.net
 S:      Supported
 
+KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC
+P:      Hollis Blanchard
+M:      hollisb@us.ibm.com
+L:      kvm-ppc-devel@lists.sourceforge.net
+W:      kvm.sourceforge.net
+S:      Supported
+
 KERNEL VIRTUAL MACHINE For Itanium(KVM/IA64)
 P:      Anthony Xu
 M:      anthony.xu@intel.com
@@ -2313,6 +2345,16 @@ L:	kvm-ia64-devel@lists.sourceforge.net
 W:      kvm.sourceforge.net
 S:      Supported
 
+KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
+P:      Carsten Otte
+M:      cotte@de.ibm.com
+P:      Christian Borntraeger
+M:      borntraeger@de.ibm.com
+M:      linux390@de.ibm.com
+L:      linux-s390@vger.kernel.org
+W:      http://www.ibm.com/developerworks/linux/linux390/
+S:      Supported
+
 KEXEC
 P:      Eric Biederman
 M:      ebiederm@xmission.com
@@ -2558,12 +2600,10 @@ W:	http://www.tazenda.demon.co.uk/phil/linux-hp
 S:      Maintained
 
 MAC80211
-P:      Michael Wu
-M:      flamingice@sourmilk.net
 P:      Johannes Berg
 M:      johannes@sipsolutions.net
-P:      Jiri Benc
-M:      jbenc@suse.cz
+P:      Michael Wu
+M:      flamingice@sourmilk.net
 L:      linux-wireless@vger.kernel.org
 W:      http://linuxwireless.org/
 T:      git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
@@ -2654,7 +2694,7 @@ P:	David Howells
 M:      dhowells@redhat.com
 P:      Koichi Yasutake
 M:      yasutake.koichi@jp.panasonic.com
-L:      linux-am33-list@redhat.com
+L:      linux-am33-list@redhat.com (moderated for non-subscribers)
 W:      ftp://ftp.redhat.com/pub/redhat/gnupro/AM33/
 S:      Maintained
 
@@ -4359,6 +4399,16 @@ L:	linux-wireless@vger.kernel.org
 W:      http://oops.ghostprotocols.net:81/blog
 S:      Maintained
 
+WM97XX TOUCHSCREEN DRIVERS
+P:      Mark Brown
+M:      broonie@opensource.wolfsonmicro.com
+P:      Liam Girdwood
+M:      liam.girdwood@wolfsonmicro.com
+L:      linux-input@vger.kernel.org
+T:      git git://opensource.wolfsonmicro.com/linux-2.6-touch
+W:      http://opensource.wolfsonmicro.com/node/7
+S:      Supported
+
 X.25 NETWORK LAYER
 P:      Henner Eisen
 M:      eis@baty.hanse.de