ARM: sti: move DEBUG_STI_UART into alphabetical order

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index ad7e322ad17b8bb985c73617407792fdc92eb33d..e626794c3860d075f5339b3760b9edfa3b18d8b6 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -797,6 +797,7 @@ F:  arch/arm/mach-gemini/
 ARM/CSR SIRFPRIMA2 MACHINE SUPPORT
 M:     Barry Song <baohua.song@csr.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git
 S:     Maintained
 F:     arch/arm/mach-prima2/
 F:     drivers/dma/sirf-dma.c
@@ -1135,6 +1136,7 @@ L:        linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-s5p*/
 F:     arch/arm/mach-exynos*/
+N:     exynos
 
 ARM/SAMSUNG MOBILE MACHINE SUPPORT
 M:     Kyungmin Park <kyungmin.park@samsung.com>
@@ -1201,6 +1203,15 @@ M:       Dinh Nguyen <dinguyen@altera.com>
 S:     Maintained
 F:     drivers/clk/socfpga/
 
+ARM/STI ARCHITECTURE
+M:     Srinivas Kandagatla <srinivas.kandagatla@st.com>
+M:     Stuart Menefy <stuart.menefy@st.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:     kernel@stlinux.com
+W:     http://www.stlinux.com
+S:     Maintained
+F:     arch/arm/mach-sti/
+
 ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -3309,6 +3320,15 @@ T:       git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git
 S:     Odd fixes
 F:     drivers/block/floppy.c
 
+FMC SUBSYSTEM
+M:     Alessandro Rubini <rubini@gnudd.com>
+W:     http://www.ohwr.org/projects/fmc-bus
+S:     Supported
+F:     drivers/fmc/
+F:     include/linux/fmc*.h
+F:     include/linux/ipmi-fru.h
+K:     fmc_d.*register
+
 FPU EMULATOR
 M:     Bill Metzenthen <billm@melbpc.org.au>
 W:     http://floatingpoint.sourceforge.net/emulator/index.html
@@ -4577,7 +4597,7 @@ F:        fs/jbd2/
 F:     include/linux/jbd2.h
 
 JSM Neo PCI based serial card
-M:     Lucas Tavares <lucaskt@linux.vnet.ibm.com>
+M:     Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
 L:     linux-serial@vger.kernel.org
 S:     Maintained
 F:     drivers/tty/serial/jsm/
@@ -7667,6 +7687,7 @@ STABLE BRANCH
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:     stable@vger.kernel.org
 S:     Supported
+F:     Documentation/stable_kernel_rules.txt
 
 STAGING SUBSYSTEM
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
@@ -7783,7 +7804,7 @@ F:        drivers/staging/media/solo6x10/
 STAGING - SPEAKUP CONSOLE SPEECH DRIVER
 M:     William Hubbs <w.d.hubbs@gmail.com>
 M:     Chris Brannon <chris@the-brannons.com>
-M:     Kirk Reiser <kirk@braille.uwo.ca>
+M:     Kirk Reiser <kirk@reisers.ca>
 M:     Samuel Thibault <samuel.thibault@ens-lyon.org>
 L:     speakup@braille.uwo.ca
 W:     http://www.linux-speakup.org/