tree d748b287a26c8e52206aeca675ec63709b1187bf
parent 7f457160dae592b71b4aac03258237b0f2a67a3e
parent 1c37fa10b275d3e5b6285066b5b27c8feae688c8
author Kevin Hilman <khilman@linaro.org> 1387558705 -0800
committer Kevin Hilman <khilman@linaro.org> 1387558731 -0800

Merge branch 'berlin/soc' into next/soc

From Sebastian Hesselbarth:
* berlin/soc:
  ARM: add initial support for Marvell Berlin SoCs
  ARM: add Armada 1500-mini and Chromecast device tree files
  ARM: add Armada 1500 and Sony NSZ-GS7 device tree files
  ARM: add Marvell Berlin UART0 lowlevel debug
  ARM: add Marvell Berlin SoCs to multi_v7_defconfig
  ARM: add Marvell Berlin SoC familiy to Marvell doc
  MAINTAINERS: add ARM Marvell Berlin SoC
  irqchip: add DesignWare APB ICTL interrupt controller

Signed-off-by: Kevin Hilman <khilman@linaro.org>