diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-07-07 17:10:38 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-07 17:10:38 +0300 |
| commit | c442c8bd510614606b18578c47c3ec93764df7b5 (patch) | |
| tree | d508fd9c5acba8fab8d2663942f0427dcffd2bc5 /drivers/soc/Kconfig | |
| parent | 9bb45cd4470607028c4abdaa4063f1674661bb0e (diff) | |
| parent | ccf62f5ab83f47796b87b4d3dff6fd33a6b02bb4 (diff) | |
| download | linux-c442c8bd510614606b18578c47c3ec93764df7b5.tar.xz | |
Merge tag 'arm-soc/for-4.8/maintainers-part2' of http://github.com/Broadcom/stblinux into next/drivers
This avoids a merge conflict between the soc branch containing the maintainer
updates, and the update for the kona reset driver.
* tag 'arm-soc/for-4.8/maintainers-part2' of http://github.com/Broadcom/stblinux:
MAINTAINERS: Update BCM281XX/BCM11XXX/BCM216XX entry
MAINTAINERS: Update BCM63XX entry
MAINTAINERS: Add NS2 entry
MAINTAINERS: Fix nsp false-positives
MAINTAINERS: Change L to M for Broadcom ARM/ARM64 SoC entries
MAINTAINERS: Update entry for BCM5301X ARM
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/soc/Kconfig')
0 files changed, 0 insertions, 0 deletions