1 files changed, 66 insertions, 14 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index e71ff7c67a63..34f52a14e051 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -221,6 +221,7 @@ F:	drivers/net/acenic*
 
 ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER
 M:      Peter Feuerer <peter@piie.net>
+L:      platform-driver-x86@vger.kernel.org
 W:      http://piie.net/?section=acerhdf
 S:      Maintained
 F:      drivers/platform/x86/acerhdf.c
@@ -228,6 +229,7 @@ F:	drivers/platform/x86/acerhdf.c
 ACER WMI LAPTOP EXTRAS
 M:      Carlos Corbacho <carlos@strangeworlds.co.uk>
 L:      aceracpi@googlegroups.com (subscribers-only)
+L:      platform-driver-x86@vger.kernel.org
 W:      http://code.google.com/p/aceracpi
 S:      Maintained
 F:      drivers/platform/x86/acer-wmi.c
@@ -288,7 +290,7 @@ F:	drivers/acpi/video.c
 
 ACPI WMI DRIVER
 M:      Carlos Corbacho <carlos@strangeworlds.co.uk>
-L:      linux-acpi@vger.kernel.org
+L:      platform-driver-x86@vger.kernel.org
 W:      http://www.lesswatts.org/projects/acpi/
 S:      Maintained
 F:      drivers/platform/x86/wmi.c
@@ -616,10 +618,10 @@ M:	Richard Purdie <rpurdie@rpsys.net>
 S:      Maintained
 
 ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
-M:      Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
+M:      Paulius Zaleckas <paulius.zaleckas@gmail.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 T:      git git://gitorious.org/linux-gemini/mainline.git
-S:      Maintained
+S:      Odd Fixes
 F:      arch/arm/mach-gemini/
 
 ARM/EBSA110 MACHINE SUPPORT
@@ -641,9 +643,9 @@ T:	topgit git://git.openezx.org/openezx.git
 F:      arch/arm/mach-pxa/ezx.c
 
 ARM/FARADAY FA526 PORT
-M:      Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
+M:      Paulius Zaleckas <paulius.zaleckas@gmail.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:      Maintained
+S:      Odd Fixes
 F:      arch/arm/mm/*-fa*
 
 ARM/FOOTBRIDGE ARCHITECTURE
@@ -968,6 +970,7 @@ ASUS ACPI EXTRAS DRIVER
 M:      Corentin Chary <corentincj@iksaif.net>
 M:      Karol Kozimor <sziwan@users.sourceforge.net>
 L:      acpi4asus-user@lists.sourceforge.net
+L:      platform-driver-x86@vger.kernel.org
 W:      http://acpi4asus.sf.net
 S:      Maintained
 F:      drivers/platform/x86/asus_acpi.c
@@ -981,6 +984,7 @@ F:	drivers/hwmon/asb100.c
 ASUS LAPTOP EXTRAS DRIVER
 M:      Corentin Chary <corentincj@iksaif.net>
 L:      acpi4asus-user@lists.sourceforge.net
+L:      platform-driver-x86@vger.kernel.org
 W:      http://acpi4asus.sf.net
 S:      Maintained
 F:      drivers/platform/x86/asus-laptop.c
@@ -1473,6 +1477,7 @@ F:	drivers/scsi/fnic/
 CMPC ACPI DRIVER
 M:      Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
 M:      Daniel Oliveira Nascimento <don@syst.com.br>
+L:      platform-driver-x86@vger.kernel.org
 S:      Supported
 F:      drivers/platform/x86/classmate-laptop.c
 
@@ -1516,6 +1521,7 @@ F:	drivers/pci/hotplug/cpcihp_generic.c
 
 COMPAL LAPTOP SUPPORT
 M:      Cezary Jackiewicz <cezary.jackiewicz@gmail.com>
+L:      platform-driver-x86@vger.kernel.org
 S:      Maintained
 F:      drivers/platform/x86/compal-laptop.c
 
@@ -1746,6 +1752,7 @@ F:	drivers/net/defxx.*
 
 DELL LAPTOP DRIVER
 M:      Matthew Garrett <mjg59@srcf.ucam.org>
+L:      platform-driver-x86@vger.kernel.org
 S:      Maintained
 F:      drivers/platform/x86/dell-laptop.c
 
@@ -2028,6 +2035,7 @@ F:	drivers/edac/r82600_edac.c
 EEEPC LAPTOP EXTRAS DRIVER
 M:      Corentin Chary <corentincj@iksaif.net>
 L:      acpi4asus-user@lists.sourceforge.net
+L:      platform-driver-x86@vger.kernel.org
 W:      http://acpi4asus.sf.net
 S:      Maintained
 F:      drivers/platform/x86/eeepc-laptop.c
@@ -2141,6 +2149,17 @@ S:	Supported
 F:      Documentation/fault-injection/
 F:      lib/fault-inject.c
 
+FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
+M:      Robert Love <robert.w.love@intel.com>
+L:      devel@open-fcoe.org
+W:      www.Open-FCoE.org
+S:      Supported
+F:      drivers/scsi/libfc/
+F:      drivers/scsi/fcoe/
+F:      include/scsi/fc/
+F:      include/scsi/libfc.h
+F:      include/scsi/libfcoe.h
+
 FILE LOCKING (flock() and fcntl()/lockf())
 M:      Matthew Wilcox <matthew@wil.cx>
 L:      linux-fsdevel@vger.kernel.org
@@ -2295,7 +2314,7 @@ F:	arch/frv/
 
 FUJITSU LAPTOP EXTRAS
 M:      Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
-L:      linux-acpi@vger.kernel.org
+L:      platform-driver-x86@vger.kernel.org
 S:      Maintained
 F:      drivers/platform/x86/fujitsu-laptop.c
 
@@ -2399,6 +2418,18 @@ L:	linuxppc-dev@ozlabs.org
 S:      Odd Fixes
 F:      drivers/char/hvc_*
 
+VIRTIO CONSOLE DRIVER
+M:      Amit Shah <amit.shah@redhat.com>
+L:      virtualization@lists.linux-foundation.org
+S:      Maintained
+F:      drivers/char/virtio_console.c
+
+iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
+M:      Peter Jones <pjones@redhat.com>
+M:      Konrad Rzeszutek Wilk <konrad@kernel.org>
+S:      Maintained
+F:      drivers/firmware/iscsi_ibft*
+
 GSPCA FINEPIX SUBDRIVER
 M:      Frank Zago <frank@zago.net>
 L:      linux-media@vger.kernel.org
@@ -2567,6 +2598,7 @@ F:	drivers/net/wireless/hostap/
 
 HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER
 M:      Carlos Corbacho <carlos@strangeworlds.co.uk>
+L:      platform-driver-x86@vger.kernel.org
 S:      Odd Fixes
 F:      drivers/platform/x86/tc1100-wmi.c
 
@@ -2777,7 +2809,7 @@ F:	drivers/video/i810/
 
 INTEL MENLOW THERMAL DRIVER
 M:      Sujith Thomas <sujith.thomas@intel.com>
-L:      linux-acpi@vger.kernel.org
+L:      platform-driver-x86@vger.kernel.org
 W:      http://www.lesswatts.org/projects/acpi/
 S:      Supported
 F:      drivers/platform/x86/intel_menlow.c
@@ -3643,6 +3675,7 @@ F:	drivers/char/mxser.*
 
 MSI LAPTOP SUPPORT
 M:      Lennart Poettering <mzxreary@0pointer.de>
+L:      platform-driver-x86@vger.kernel.org
 W:      https://tango.0pointer.de/mailman/listinfo/s270-linux
 W:      http://0pointer.de/lennart/tchibo.html
 S:      Maintained
@@ -3650,6 +3683,7 @@ F:	drivers/platform/x86/msi-laptop.c
 
 MSI WMI SUPPORT
 M:      Anisse Astier <anisse@astier.eu>
+L:      platform-driver-x86@vger.kernel.org
 S:      Supported
 F:      drivers/platform/x86/msi-wmi.c
 
@@ -4102,6 +4136,7 @@ F:	drivers/i2c/busses/i2c-pasemi.c
 
 PANASONIC LAPTOP ACPI EXTRAS DRIVER
 M:      Harald Welte <laforge@gnumonks.org>
+L:      platform-driver-x86@vger.kernel.org
 S:      Maintained
 F:      drivers/platform/x86/panasonic-laptop.c
 
@@ -4522,7 +4557,7 @@ F:	drivers/net/wireless/ray*
 RCUTORTURE MODULE
 M:      Josh Triplett <josh@freedesktop.org>
 M:      "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
-S:      Maintained
+S:      Supported
 F:      Documentation/RCU/torture.txt
 F:      kernel/rcutorture.c
 
@@ -4547,11 +4582,12 @@ M:	Dipankar Sarma <dipankar@in.ibm.com>
 M:      "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 W:      http://www.rdrop.com/users/paulmck/rclock/
 S:      Supported
-F:      Documentation/RCU/rcu.txt
-F:      Documentation/RCU/rcuref.txt
-F:      include/linux/rcupdate.h
-F:      include/linux/srcu.h
-F:      kernel/rcupdate.c
+F:      Documentation/RCU/
+F:      include/linux/rcu*
+F:      include/linux/srcu*
+F:      kernel/rcu*
+F:      kernel/srcu*
+X:      kernel/rcutorture.c
 
 REAL TIME CLOCK DRIVER
 M:      Paul Gortmaker <p_gortmaker@yahoo.com>
@@ -4689,6 +4725,13 @@ F:	drivers/media/common/saa7146*
 F:      drivers/media/video/*7146*
 F:      include/media/*7146*
 
+TLG2300 VIDEO4LINUX-2 DRIVER
+M:      Huang Shijie <shijie8@gmail.com>
+M:      Kang Yong <kangyong@telegent.com>
+M:      Zhang Xiaobing <xbzhang@telegent.com>
+S:      Supported
+F:      drivers/media/video/tlg2300
+
 SC1200 WDT DRIVER
 M:      Zwane Mwaikambo <zwane@arm.linux.org.uk>
 S:      Maintained
@@ -5049,7 +5092,7 @@ F:	include/linux/ssb/
 
 SONY VAIO CONTROL DEVICE DRIVER
 M:      Mattia Dongili <malattia@linux.it>
-L:      linux-acpi@vger.kernel.org
+L:      platform-driver-x86@vger.kernel.org
 W:      http://www.linux.it/~malattia/wiki/index.php/Sony_drivers
 S:      Maintained
 F:      Documentation/laptops/sony-laptop.txt
@@ -5255,6 +5298,7 @@ F:	arch/xtensa/
 THINKPAD ACPI EXTRAS DRIVER
 M:      Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
 L:      ibm-acpi-devel@lists.sourceforge.net
+L:      platform-driver-x86@vger.kernel.org
 W:      http://ibm-acpi.sourceforge.net
 W:      http://thinkwiki.org/wiki/Ibm-acpi
 T:      git git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git
@@ -5308,10 +5352,12 @@ F:	security/tomoyo/
 
 TOPSTAR LAPTOP EXTRAS DRIVER
 M:      Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+L:      platform-driver-x86@vger.kernel.org
 S:      Maintained
 F:      drivers/platform/x86/topstar-laptop.c
 
 TOSHIBA ACPI EXTRAS DRIVER
+L:      platform-driver-x86@vger.kernel.org
 S:      Orphan
 F:      drivers/platform/x86/toshiba_acpi.c
 
@@ -6048,6 +6094,12 @@ S:	Maintained
 F:      Documentation/x86/
 F:      arch/x86/
 
+X86 PLATFORM DRIVERS
+M:      Matthew Garrett <mjg@redhat.com>
+L:      platform-driver-x86@vger.kernel.org
+S:      Maintained
+F:      drivers/platform/x86
+
 XEN HYPERVISOR INTERFACE
 M:      Jeremy Fitzhardinge <jeremy@xensource.com>
 M:      Chris Wright <chrisw@sous-sol.org>