diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-04-25 23:48:29 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-25 23:48:29 +0200 |
commit | c6ba3f693297fb900ad7435cc963abd2582b1176 (patch) | |
tree | 592caab877aef6bb45ca880abc430061e9dc4023 /drivers/soc/qcom/smd.c | |
parent | drivers: firmware: psci: make two helper functions static (diff) | |
parent | bus: brcmstb_gisb: Rework dependencies (diff) | |
download | linux-c6ba3f693297fb900ad7435cc963abd2582b1176.tar.xz linux-c6ba3f693297fb900ad7435cc963abd2582b1176.zip |
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
Diffstat (limited to 'drivers/soc/qcom/smd.c')
0 files changed, 0 insertions, 0 deletions