aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-02-07 10:23:55 -0500
committerArnd Bergmann <arnd@arndb.de>2017-02-07 10:23:55 -0500
commitbe07af29008e732257083013e82948d328b5878b (patch)
tree04e7ba33b7fb48934a72428e7237203d62706887
parentef4968f453a6b0093182cfef893fee1a4159b6b2 (diff)
parent902dcd14dae10e6ddc464d5034b1709d10c30d8e (diff)
Merge tag 'arm-soc/for-4.11/maintainers' of http://github.com/Broadcom/stblinux into next/soc
Pull "Broadcom maintainers changes for 4.11" from Florian Fainelli: This pull request contains Broadcom MAINTAINERS entries updates for 4.11: - Eric updates the git repository for the BCM283x development * tag 'arm-soc/for-4.11/maintainers' of http://github.com/Broadcom/stblinux: MAINTAINERS: Update for the current location of the bcm2835 tree.
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index e14de9a21235..575c284c660f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2620,7 +2620,7 @@ M: Lee Jones <lee@kernel.org>
2620M: Eric Anholt <eric@anholt.net> 2620M: Eric Anholt <eric@anholt.net>
2621L: linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers) 2621L: linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
2622L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 2622L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
2623T: git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git 2623T: git git://github.com/anholt/linux
2624S: Maintained 2624S: Maintained
2625N: bcm2835 2625N: bcm2835
2626F: drivers/staging/vc04_services 2626F: drivers/staging/vc04_services