Merge tag 'arm-soc/for-4.8/maintainers-part2' of http://github.com/Broadcom/stblinux...
authorArnd Bergmann <arnd@arndb.de>
Thu, 7 Jul 2016 14:10:38 +0000 (16:10 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 7 Jul 2016 14:10:38 +0000 (16:10 +0200)
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>
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge