aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-26 23:29:52 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-26 23:29:52 -0400
commit25918f9811eae1d657db2bccdfcb077038d9454c (patch)
treed492a30c0d889a990fdb85ef38653773a633f321 /MAINTAINERS
parentaa0b3b2bee1d3ca8355de76caebf65b836c9bb6e (diff)
parentfa7c865ad999d6ca340bca471fab7f3a3e6ae011 (diff)
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson: "A mixed bag of fixes, some for merge window fallout (tegra, MXS), and a short series of fixes for marvell platforms that didn't make it in before 3.5." * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: mxs: fix compile error caused by prom_update_property change ARM: dt: tegra trimslice: enable USB2 port ARM: dt: tegra trimslice: add vbus-gpio property ARM: vt8500: Add maintainer for VT8500 architecture ARM: Kirkwood: Replace mrvl with marvell ARM: Orion: fix driver probe error handling with respect to clk ARM: Dove: Fixup ge00 initialisation ARM: Kirkwood: Fix PHY disable clk problems ARM: Kirkwood: Ensure runit clock always ticks. ARM: versatile: Don't use platform clock for Integrator & VE ARM: tegra: harmony: add regulator supply name and its input supply
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS11
1 files changed, 11 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 3bc49687b653..bd451649f13a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1186,6 +1186,17 @@ S: Maintained
1186F: arch/arm/mach-pxa/vpac270.c 1186F: arch/arm/mach-pxa/vpac270.c
1187F: arch/arm/mach-pxa/include/mach/vpac270.h 1187F: arch/arm/mach-pxa/include/mach/vpac270.h
1188 1188
1189ARM/VT8500 ARM ARCHITECTURE
1190M: Tony Prisk <linux@prisktech.co.nz>
1191L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
1192S: Maintained
1193F: arch/arm/mach-vt8500/
1194F: drivers/video/vt8500lcdfb.*
1195F: drivers/video/wm8505fb*
1196F: drivers/video/wmt_ge_rops.*
1197F: drivers/tty/serial/vt8500_serial.c
1198F: drivers/rtc/rtc-vt8500-c
1199
1189ARM/ZIPIT Z2 SUPPORT 1200ARM/ZIPIT Z2 SUPPORT
1190M: Marek Vasut <marek.vasut@gmail.com> 1201M: Marek Vasut <marek.vasut@gmail.com>
1191L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 1202L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)