From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 25 Sep 2014 21:48:18 +0000 (+0200)
Subject: Merge tag 'bcm63138-v4' of http://github.com/brcm/linux into next/soc
X-Git-Tag: fixes-for-v3.18-merge-window~5^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1e85e76ef327d4b013453ddd7b2c673aa304a71;p=pandora-kernel.git

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

e1e85e76ef327d4b013453ddd7b2c673aa304a71
Reading git-diff-tree failed