-
Arnd Bergmann authored
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>
c442c8bd