From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 17 Mar 2014 13:45:28 +0000 (+0100)
Subject: Merge tag 'armsoc/for-3.15/soc-3' of git://github.com/broadcom/mach-bcm into next/soc
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3b325a494ba8835b9dc85c7dcc23b887c7deb119;p=deliverable%2Flinux.git

Merge tag 'armsoc/for-3.15/soc-3' of git://github.com/broadcom/mach-bcm into next/soc

Merge "ARM: mach-bcm: soc updates for 3.15 - part 2" from Matt Porter:

- Add bcm21664 support
- Use Kona Debug UART only on ARCH_BCM_MOBILE

* tag 'armsoc/for-3.15/soc-3' of git://github.com/broadcom/mach-bcm:
  ARM: restrict BCM_KONA_UART to ARCH_BCM_MOBILE
  ARM: bcm21664: Add board support.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

3b325a494ba8835b9dc85c7dcc23b887c7deb119