projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8efa50c 7aa2077)
Merge tag 'armsoc/for-3.15/soc-3' of git://github.com/broadcom/mach-bcm into next/soc
authorArnd Bergmann <arnd@arndb.de>
Mon, 17 Mar 2014 13:45:28 +0000 (14:45 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 17 Mar 2014 13:45:28 +0000 (14:45 +0100)
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>
1  2 
arch/arm/Kconfig.debug patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig.debug
Simple merge