Merge tag 'bcm63138-v4' of http://github.com/brcm/linux into next/soc
authorArnd Bergmann <arnd@arndb.de>
Thu, 25 Sep 2014 21:48:18 +0000 (23:48 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 25 Sep 2014 21:50:02 +0000 (23:50 +0200)
commite1e85e76ef327d4b013453ddd7b2c673aa304a71
tree3fe22edbe9bf4d4ec6de24f7ad53f73ba23b21ac
parent57e33ff1dba139a70723e922c5838499610b60c1
parente076e96227ef6b5b66cfdd79e75401bd2f6d532f
Merge tag 'bcm63138-v4' of github.com/brcm/linux into next/soc

Merge "ARM: BCM: Broadcom BCM63138 support" from Florian Fainelli:

This patchset adds very minimal support for the BCM63138 SoC which is
a xDSL SoC using a dual Cortex A9 CPU complex.

* tag 'bcm63138-v4' of http://github.com/brcm/linux:
  MAINTAINERS: add entry for the Broadcom BCM63xx ARM SoCs
  ARM: BCM63XX: add BCM963138DVT Reference platform DTS
  ARM: BCM63XX: add BCM63138 minimal Device Tree
  ARM: BCM63XX: add low-level UART debug support
  ARM: BCM63XX: add basic support for the Broadcom BCM63138 DSL SoC

Conflicts:
arch/arm/Kconfig.debug

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
MAINTAINERS
arch/arm/Kconfig.debug
arch/arm/boot/dts/Makefile
arch/arm/mach-bcm/Makefile