Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM SoC platform updates from Olof Johansson:
 "SoC platform changes. Main theme this merge window:

   - The Netx platform (Netx 100/500) platform is removed by Linus
     Walleij-- the SoC doesn't have active maintainers with hardware,
     and in discussions with the vendor the agreement was that it's OK
     to remove.

   - Russell King has a series of patches that cleans up and refactors
     SA1101 and RiscPC support"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (47 commits)
  ARM: stm32: use "depends on" instead of "if" after prompt
  ARM: sa1100: convert to common clock framework
  ARM: exynos: Cleanup cppcheck shifting warning
  ARM: pxa/lubbock: remove lubbock_set_misc_wr() from global view
  ARM: exynos: Only build MCPM support if used
  arm: add missing include platform-data/atmel.h
  ARM: davinci: Use GPIO lookup table for DA850 LEDs
  ARM: OMAP2: drop explicit assembler architecture
  ARM: use arch_extension directive instead of arch argument
  ARM: imx: Switch imx7d to imx-cpufreq-dt for speed-grading
  ARM: bcm: Enable PINCTRL for ARCH_BRCMSTB
  ARM: bcm: Enable ARCH_HAS_RESET_CONTROLLER for ARCH_BRCMSTB
  ARM: riscpc: enable chained scatterlist support
  ARM: riscpc: reduce IRQ handling code
  ARM: riscpc: move RiscPC assembly files from arch/arm/lib to mach-rpc
  ARM: riscpc: parse video information from tagged list
  ARM: riscpc: add ecard quirk for Atomwide 3port serial card
  MAINTAINERS: mvebu: Add git entry
  soc: ti: pm33xx: Add a print while entering RTC only mode with DDR in self-refresh
  ARM: OMAP2+: Make some variables static
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-bcm/bcm63xx_smp.c
Simple merge

diff --cc arch/arm/mach-davinci/board-da850-evm.c
Simple merge

diff --cc arch/arm/mach-highbank/smc.S
Simple merge

diff --cc arch/arm/mach-imx/cpuidle-imx6q.c
Simple merge

diff --cc arch/arm/mach-imx/mach-imx7d.c
Simple merge

diff --cc arch/arm/mach-keystone/smc.S
Simple merge

diff --cc arch/arm/mach-omap2/omap-headsmp.S
Simple merge

diff --cc arch/arm/mach-omap2/omap-smc.S
Simple merge

diff --cc arch/arm/mach-omap2/sleep44xx.S
Simple merge

diff --cc arch/arm/mach-pxa/include/mach/lubbock.h
Simple merge

diff --cc arch/arm/mach-pxa/lubbock.c
Simple merge

diff --cc arch/arm/mach-rpc/dma.c
Simple merge

diff --cc arch/arm/mach-rpc/ecard-loader.S
Simple merge

diff --cc arch/arm/mach-rpc/ecard.c
Simple merge

diff --cc arch/arm/mach-rpc/floppydma.S
Simple merge

diff --cc arch/arm/mach-rpc/include/mach/uncompress.h
Simple merge

diff --cc arch/arm/mach-rpc/io-acorn.S
Simple merge

diff --cc arch/arm/mach-rpc/time.c
Simple merge

diff --cc arch/arm/mach-sa1100/assabet.c
Simple merge

diff --cc arch/arm/mach-sa1100/badge4.c
Simple merge

diff --cc arch/arm/mach-sa1100/h3xxx.c
Simple merge

diff --cc arch/arm/mach-sa1100/hackkit.c
Simple merge

diff --cc arch/arm/mach-stm32/Kconfig
Simple merge

diff --cc arch/arm64/Kconfig.platforms
Simple merge

diff --cc drivers/tty/serial/Kconfig
Simple merge