projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 800daa6 2dc9e0b)
Merge tag 'arm-soc/for-4.8/soc-part2' of http://github.com/Broadcom/stblinux into...
authorArnd Bergmann <arnd@arndb.de>
Thu, 7 Jul 2016 13:33:54 +0000 (15:33 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 7 Jul 2016 14:09:25 +0000 (16:09 +0200)
Merge "the second part of the Broadcom ARM-based SoC changes" from Florian Fainelli:

- Florian updates the DEBUG_UART_BCM5301X entry to cover both NS and NSP SoCs
  since they both have the same location

* tag 'arm-soc/for-4.8/soc-part2' of http://github.com/Broadcom/stblinux:
  ARM: debug: Enable DEBUG_BCM_5301X for Northstar Plus SoCs

1  2 
arch/arm/Kconfig.debug patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig.debug
Simple merge
Unnamed repository; edit this file 'description' to name the repository.