summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-03-11 13:28:32 -0700
committerOlof Johansson <olof@lixom.net>2014-03-11 13:28:32 -0700
commit0daba17de771388a004148a357f7c63d648b0b3b (patch)
treed810487f9b1b37b2c7b456be96fbb1cdfdca8254 /MAINTAINERS
parent50776b6cf85d4b2bf3c4f209c4e01f354d0daa2c (diff)
parentd30fe6272183f3cc8b9f3f111cd36271332e4cec (diff)
downloadlinux-0daba17de771388a004148a357f7c63d648b0b3b.tar.gz
linux-0daba17de771388a004148a357f7c63d648b0b3b.tar.bz2
linux-0daba17de771388a004148a357f7c63d648b0b3b.zip
Merge tag 'bcm2835-for-3.15-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi into next/cleanup
Merge "ARM: bcm2835: consolidate into mach-bcm/" from Stephen Warren: This pull request consists of a single patch which moves files from arch/arm/mach-bcm2835 into mach-bcm, thus consolidating them with support for other Broadcom chips. * tag 'bcm2835-for-3.15-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi: ARM: bcm2835: Move to mach-bcm directory Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 9dbf7f1898c5..a9fd26095529 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1883,7 +1883,7 @@ M: Stephen Warren <swarren@wwwdotorg.org>
L: linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
T: git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git
S: Maintained
-F: arch/arm/mach-bcm2835/
+F: arch/arm/mach-bcm/board_bcm2835.c
F: arch/arm/boot/dts/bcm2835*
F: arch/arm/configs/bcm2835_defconfig
F: drivers/*/*bcm2835*