Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit c442c8bd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-4.8/maintainers-part2' of...

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 9bb45cd4 ccf62f5a
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment