]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'arm-soc/for-4.12/drivers-fixes' of http://github.com/Broadcom/stblinux...
authorOlof Johansson <olof@lixom.net>
Fri, 19 May 2017 06:56:26 +0000 (23:56 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 19 May 2017 06:56:26 +0000 (23:56 -0700)
This pull request contains Broadcom SoC drivers fixes for 4.12, please
pull the following:

- Florian removes the duplicate compatible string matched by the
  SUN_TOP_CTRL driver and instead uses the correct one for 7435

* tag 'arm-soc/for-4.12/drivers-fixes' of http://github.com/Broadcom/stblinux:
  soc: bcm: brcmstb: Correctly match 7435 SoC

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

Trivial merge