Merge tag 'arm-soc/for-4.7/drivers' of http://github.com/Broadcom/stblinux into next...
authorArnd Bergmann <arnd@arndb.de>
Mon, 25 Apr 2016 21:48:29 +0000 (23:48 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 25 Apr 2016 21:48:29 +0000 (23:48 +0200)
commitc6ba3f693297fb900ad7435cc963abd2582b1176
tree592caab877aef6bb45ca880abc430061e9dc4023
parent21e8868e661ededd2c45c8ec27f6fd5354b88b71
parentb0ec633c28d42281c03b41dbc92a4448a481f2f3
Merge tag 'arm-soc/for-4.7/drivers' of 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
drivers/bus/Kconfig