summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-07-07 16:10:38 +0200
committerArnd Bergmann <arnd@arndb.de>2016-07-07 16:10:38 +0200
commitc442c8bd510614606b18578c47c3ec93764df7b5 (patch)
treed508fd9c5acba8fab8d2663942f0427dcffd2bc5 /drivers
parent9bb45cd4470607028c4abdaa4063f1674661bb0e (diff)
parentccf62f5ab83f47796b87b4d3dff6fd33a6b02bb4 (diff)
downloadop-kernel-dev-c442c8bd510614606b18578c47c3ec93764df7b5.zip
op-kernel-dev-c442c8bd510614606b18578c47c3ec93764df7b5.tar.gz
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')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud