aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-04-05 17:19:54 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-05 17:19:54 -0400
commitff050ad12c551233e546506409c89eb2f640d9f3 (patch)
tree8ae29fece122a91cbd6160fb2ca34c0ea82c3df9 /MAINTAINERS
parentdfc25e4503aef6b82a1de4a0fbe19aafa8648fbe (diff)
parent9233087dc468f75bdeb7830c694c09dc74be88c4 (diff)
Merge tag 'soc-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC specific changes from Arnd Bergmann: "Lots of changes specific to one of the SoC families. Some that stick out are: - mach-qcom gains new features, most importantly SMP support for the newer chips (Stephen Boyd, Rohit Vaswani) - mvebu gains support for three new SoCs: Armada 375, 380 and 385 (Thomas Petazzoni and Free-electrons team) - SMP support for Rockchips (Heiko Stübner) - Lots of i.MX changes (Shawn Guo) - Added support for BCM5301x SoC (Hauke Mehrtens) - Multiplatform support for Marvell Kirkwood and Dove (Andrew Lunn and Sebastian Hesselbarth doing the final part of a long journey) - Unify davinci platforms and remove obsolete ones (Sekhar Nori, Arnd Bergmann)" * tag 'soc-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (126 commits) ARM: sunxi: Select HAVE_ARM_ARCH_TIMER ARM: cache-tauros2: remove ARMv6 code ARM: mvebu: don't select CONFIG_NEON ARM: davinci: fix DT booting with default defconfig ARM: configs: bcm_defconfig: enable bcm590xx regulator support ARM: davinci: remove tnetv107x support MAINTAINERS: Update ARM STi maintainers ARM: restrict BCM_KONA_UART to ARCH_BCM_MOBILE ARM: bcm21664: Add board support. ARM: sunxi: Add the new watchog compatibles to the reboot code ARM: enable ARM_HAS_SG_CHAIN for multiplatform ARM: davinci: remove da8xx_omapl_defconfig ARM: davinci: da8xx: fix multiple watchdog device registration ARM: davinci: add da8xx specific configs to davinci_all_defconfig ARM: davinci: enable da8xx build concurrently with older devices ARM: BCM5301X: workaround suppress fault ARM: BCM5301X: add early debugging support ARM: BCM5301X: initial support for the BCM5301X/BCM470X SoCs with ARM CPU ARM: mach-bcm: Remove GENERIC_TIME ARM: shmobile: APMU: Fix warnings due to improper printk formats ...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS20
1 files changed, 18 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 74e33b8913bf..2421c8d5ec5c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1291,13 +1291,21 @@ S: Maintained
1291F: drivers/clk/socfpga/ 1291F: drivers/clk/socfpga/
1292 1292
1293ARM/STI ARCHITECTURE 1293ARM/STI ARCHITECTURE
1294M: Srinivas Kandagatla <srinivas.kandagatla@st.com> 1294M: Srinivas Kandagatla <srinivas.kandagatla@gmail.com>
1295M: Stuart Menefy <stuart.menefy@st.com> 1295M: Maxime Coquelin <maxime.coquelin@st.com>
1296M: Patrice Chotard <patrice.chotard@st.com>
1296L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 1297L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1297L: kernel@stlinux.com 1298L: kernel@stlinux.com
1298W: http://www.stlinux.com 1299W: http://www.stlinux.com
1299S: Maintained 1300S: Maintained
1300F: arch/arm/mach-sti/ 1301F: arch/arm/mach-sti/
1302F: arch/arm/boot/dts/sti*
1303F: drivers/clocksource/arm_global_timer.c
1304F: drivers/reset/sti/
1305F: drivers/pinctrl/pinctrl-st.c
1306F: drivers/media/rc/st_rc.c
1307F: drivers/i2c/busses/i2c-st.c
1308F: drivers/tty/serial/st-asc.c
1301 1309
1302ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT 1310ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
1303M: Lennert Buytenhek <kernel@wantstofly.org> 1311M: Lennert Buytenhek <kernel@wantstofly.org>
@@ -1907,6 +1915,14 @@ F: arch/arm/boot/dts/bcm2835*
1907F: arch/arm/configs/bcm2835_defconfig 1915F: arch/arm/configs/bcm2835_defconfig
1908F: drivers/*/*bcm2835* 1916F: drivers/*/*bcm2835*
1909 1917
1918BROADCOM BCM5301X ARM ARCHICTURE
1919M: Hauke Mehrtens <hauke@hauke-m.de>
1920L: linux-arm-kernel@lists.infradead.org
1921S: Maintained
1922F: arch/arm/mach-bcm/bcm_5301x.c
1923F: arch/arm/boot/dts/bcm5301x.dtsi
1924F: arch/arm/boot/dts/bcm470*
1925
1910BROADCOM TG3 GIGABIT ETHERNET DRIVER 1926BROADCOM TG3 GIGABIT ETHERNET DRIVER
1911M: Nithin Nayak Sujir <nsujir@broadcom.com> 1927M: Nithin Nayak Sujir <nsujir@broadcom.com>
1912M: Michael Chan <mchan@broadcom.com> 1928M: Michael Chan <mchan@broadcom.com>