From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 31 Mar 2017 08:56:59 +0000 (+0200)
Subject: Merge tag 'arm-soc/for-4.12/drivers' of http://github.com/Broadcom/stblinux into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3ed0b8a76a6dc4158d7ba1ab7297a0477f7ea31d;p=linux.git

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
---

3ed0b8a76a6dc4158d7ba1ab7297a0477f7ea31d