From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 25 Apr 2016 21:48:29 +0000 (+0200)
Subject: Merge tag 'arm-soc/for-4.7/drivers' of http://github.com/Broadcom/stblinux into next... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c6ba3f693297fb900ad7435cc963abd2582b1176;p=linux-beck.git

Merge tag 'arm-soc/for-4.7/drivers' of http://github.com/Broadcom/stblinux into next/drivers

Merge "Broadcom ARM-based SoCs drivers changes" from Florian Fainelli:

- Justin adds a soc_dev driver to properly report to user-space the Broadcom
  STB SoC family, product and revision

- Florian reworks how the brcmstb_gisb driver dependency is done to enable it
  on Broadcom STB MIPS-based SoCs and remove a select in
  arch/arm/mach-bcm/Kconfig

* tag 'arm-soc/for-4.7/drivers' of http://github.com/Broadcom/stblinux:
  bus: brcmstb_gisb: Rework dependencies
  soc: brcmstb: add SoC driver to brcmstb
---

c6ba3f693297fb900ad7435cc963abd2582b1176