]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge tag 'arm-soc/for-4.19/soc' of https://github.com/Broadcom/stblinux into next/soc
authorOlof Johansson <olof@lixom.net>
Sat, 14 Jul 2018 21:12:22 +0000 (14:12 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 14 Jul 2018 21:12:22 +0000 (14:12 -0700)
This pull request contains Broadcom ARM-based SoCs platform changes for
4.19, please pull the following:

- Clement re-orders the UART debug entries to be in ascending order and
  he also adds the iProc UART3 debug address since that is a common
  location for iProc based designs.

* tag 'arm-soc/for-4.19/soc' of https://github.com/Broadcom/stblinux:
  ARM: debug: fix BCM2836 order entry
  ARM: debug: Add iProc UART3 debug addresses

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge