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
  ...

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
 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>