diff options
| author | Olof Johansson <olof@lixom.net> | 2014-03-11 21:28:32 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-03-11 21:28:32 +0100 |
| commit | 0daba17de771388a004148a357f7c63d648b0b3b (patch) | |
| tree | d810487f9b1b37b2c7b456be96fbb1cdfdca8254 /MAINTAINERS | |
| parent | Merge tag 'armsoc/for-3.15/cleanup' of git://github.com/broadcom/mach-bcm int... (diff) | |
| parent | ARM: bcm2835: Move to mach-bcm directory (diff) | |
| download | linux-0daba17de771388a004148a357f7c63d648b0b3b.tar.xz 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-- | MAINTAINERS | 2 |
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* |