Merge tag 'arm-soc/for-4.12/drivers' of http://github.com/Broadcom/stblinux into...
authorArnd Bergmann <arnd@arndb.de>
Fri, 31 Mar 2017 08:56:59 +0000 (10:56 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 31 Mar 2017 08:56:59 +0000 (10:56 +0200)
commit3ed0b8a76a6dc4158d7ba1ab7297a0477f7ea31d
treef2f05174be956e3b169facac9b8328d508188de1
parent99b19a1f21c68334f8c919c3d6ca4a18be31cf69
parentbd0faf08dc7fcb3e555b35f556c9012b3c93de3b
Merge tag 'arm-soc/for-4.12/drivers' of github.com/Broadcom/stblinux into next/drivers

Pull "Broadcom drivers changes for 4.12" from Florian Fainelli:

This pull request contains Broadcom ARM-based SoC drivers updates for 4.12,
please pull the following changes:

- Florian updates the Broadcom STB GISB arbiter driver with a bunch of
  compatible strings for MIPS-based STBs found under arch/mips/boot/dts/brcm/ in
  order for the SoC identification driver to recognize these chips

* tag 'arm-soc/for-4.12/drivers' of http://github.com/Broadcom/stblinux:
  soc: bcm: brcmstb: Match additional compatible strings