]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge tag 'arm-soc/for-4.15/soc-part2' of http://github.com/Broadcom/stblinux into...
authorArnd Bergmann <arnd@arndb.de>
Mon, 30 Oct 2017 10:03:28 +0000 (11:03 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 30 Oct 2017 10:03:28 +0000 (11:03 +0100)
Pull "Broadcom soc changes for 4.15 (part 2)" from Florian Fainelli:

This pull request contains Broadcom ARM-based SoC changes for 4.15 (second
part), please pull the following:

- Florian adds support for the Broadcom Hurricane 2 SoC machine entry point
  and defines the debug UART address for use with earlyprintk/DEBUG_LL

* tag 'arm-soc/for-4.15/soc-part2' of http://github.com/Broadcom/stblinux:
  ARM: debug: Add Hurricane 2 UART2 debug addresses
  ARM: bcm: Add support for Broadcom Hurricane 2 SoC

1  2 
arch/arm/Kconfig.debug

Simple merge