Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 74e33b8913bf10a4b9ef263182ed0e48886bc43b..d0b8afe261236d806950610e4e23e8abdb2d7649 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1291,13 +1291,21 @@ S:      Maintained
 F:     drivers/clk/socfpga/
 
 ARM/STI ARCHITECTURE
-M:     Srinivas Kandagatla <srinivas.kandagatla@st.com>
-M:     Stuart Menefy <stuart.menefy@st.com>
+M:     Srinivas Kandagatla <srinivas.kandagatla@gmail.com>
+M:     Maxime Coquelin <maxime.coquelin@st.com>
+M:     Patrice Chotard <patrice.chotard@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/
+F:     arch/arm/boot/dts/sti*
+F:     drivers/clocksource/arm_global_timer.c
+F:     drivers/reset/sti/
+F:     drivers/pinctrl/pinctrl-st.c
+F:     drivers/media/rc/st_rc.c
+F:     drivers/i2c/busses/i2c-st.c
+F:     drivers/tty/serial/st-asc.c
 
 ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
@@ -1907,6 +1915,14 @@ F:       arch/arm/boot/dts/bcm2835*
 F:     arch/arm/configs/bcm2835_defconfig
 F:     drivers/*/*bcm2835*
 
+BROADCOM BCM5301X ARM ARCHICTURE
+M:     Hauke Mehrtens <hauke@hauke-m.de>
+L:     linux-arm-kernel@lists.infradead.org
+S:     Maintained
+F:     arch/arm/mach-bcm/bcm_5301x.c
+F:     arch/arm/boot/dts/bcm5301x.dtsi
+F:     arch/arm/boot/dts/bcm470*
+
 BROADCOM TG3 GIGABIT ETHERNET DRIVER
 M:     Nithin Nayak Sujir <nsujir@broadcom.com>
 M:     Michael Chan <mchan@broadcom.com>
@@ -2302,7 +2318,7 @@ F:        include/uapi/linux/coda*.h
 
 COMMON CLK FRAMEWORK
 M:     Mike Turquette <mturquette@linaro.org>
-L:     linux-arm-kernel@lists.infradead.org (same as CLK API & CLKDEV)
+L:     linux-kernel@vger.kernel.org
 T:     git git://git.linaro.org/people/mturquette/linux.git
 S:     Maintained
 F:     drivers/clk/
@@ -4526,8 +4542,7 @@ K:        \b(ABS|SYN)_MT_
 
 INTEL C600 SERIES SAS CONTROLLER DRIVER
 M:     Intel SCU Linux support <intel-linux-scu@intel.com>
-M:     Lukasz Dorau <lukasz.dorau@intel.com>
-M:     Maciej Patelczyk <maciej.patelczyk@intel.com>
+M:     Artur Paszkiewicz <artur.paszkiewicz@intel.com>
 M:     Dave Jiang <dave.jiang@intel.com>
 L:     linux-scsi@vger.kernel.org
 T:     git git://git.code.sf.net/p/intel-sas/isci