From: Arnd Bergmann Date: Thu, 7 Jul 2016 14:10:38 +0000 (+0200) Subject: Merge tag 'arm-soc/for-4.8/maintainers-part2' of http://github.com/Broadcom/stblinux... X-Git-Tag: v4.8-rc1~67^2~3 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=c442c8bd510614606b18578c47c3ec93764df7b5;p=linux-2.6-block.git Merge tag 'arm-soc/for-4.8/maintainers-part2' of 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 --- c442c8bd510614606b18578c47c3ec93764df7b5