| commit | 3d2ba3fb544385f335ddb34afd97e480acabb87e | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Thu May 18 23:56:26 2017 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Thu May 18 23:56:26 2017 -0700 |
| tree | a6d7b5d9b846a77f6ed8eef6472039f1b1d06d2e | |
| parent | 5cb1ac0f7906cea3d978e54023e9432e910579c8 [diff] | |
| parent | 31d848aa1d85530770f0bdf1b61a042335d340ad [diff] |
Merge tag 'arm-soc/for-4.12/drivers-fixes' of http://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>