projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5cb1ac0 31d848a)
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)
commit3d2ba3fb544385f335ddb34afd97e480acabb87e
treea6d7b5d9b846a77f6ed8eef6472039f1b1d06d2etree | snapshot
parent5cb1ac0f7906cea3d978e54023e9432e910579c8commit | diff
parent31d848aa1d85530770f0bdf1b61a042335d340adcommit | diff
Merge tag 'arm-soc/for-4.12/drivers-fixes' of github.com/Broadcom/stblinux into fixes

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>
John Crispins staging tree