aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-09 17:20:39 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-09 17:20:39 -0500
commit57e964e1ae9bd4f699ae1074430bcf81a9a11377 (patch)
tree8c1fc5199e18a55cece4aa72bbaf2ca909bd1453 /MAINTAINERS
parent4dee6b64ee7cfef94b47733c6d9fef07f8051c7c (diff)
parent39fbc76272225fb991ffdfac1e08974506cfa3eb (diff)
Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Non-critical bug fixes Simple bug fixes that were not considered important enough for inclusion into 3.2. * tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: MAINTAINERS: update pxa and mmp ARM: pxa: Include linux/export.h in balloon3.c ARM: OMAP4: clock: Add CPU local timer clock node ARM: OMAP4: hwmod: Don't wait for the idle status if modulemode is not supported ARM: OMAP: AM3517/3505: fix crash on boot due to incorrect voltagedomain data ARM: OMAP: hwmod data: fix the panic on Nokia RM-680 during boot ARM: OMAP2+: DMA: Workaround for invalid destination position ARM: OMAP2+: DMA: Workaround for invalid source position
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS22
1 files changed, 7 insertions, 15 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 78b078e8e0af..ba6bd97976b0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5297,7 +5297,10 @@ F: drivers/media/video/pvrusb2/
5297PXA2xx/PXA3xx SUPPORT 5297PXA2xx/PXA3xx SUPPORT
5298M: Eric Miao <eric.y.miao@gmail.com> 5298M: Eric Miao <eric.y.miao@gmail.com>
5299M: Russell King <linux@arm.linux.org.uk> 5299M: Russell King <linux@arm.linux.org.uk>
5300M: Haojian Zhuang <haojian.zhuang@marvell.com>
5300L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 5301L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
5302T: git git://github.com/hzhuang1/linux.git
5303T: git git://git.linaro.org/people/ycmiao/pxa-linux.git
5301S: Maintained 5304S: Maintained
5302F: arch/arm/mach-pxa/ 5305F: arch/arm/mach-pxa/
5303F: drivers/pcmcia/pxa2xx* 5306F: drivers/pcmcia/pxa2xx*
@@ -5307,25 +5310,14 @@ F: include/sound/pxa2xx-lib.h
5307F: sound/arm/pxa* 5310F: sound/arm/pxa*
5308F: sound/soc/pxa 5311F: sound/soc/pxa
5309 5312
5310PXA168 SUPPORT 5313MMP SUPPORT
5311M: Eric Miao <eric.y.miao@gmail.com>
5312M: Jason Chagas <jason.chagas@marvell.com>
5313L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
5314T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
5315S: Maintained
5316
5317PXA910 SUPPORT
5318M: Eric Miao <eric.y.miao@gmail.com> 5314M: Eric Miao <eric.y.miao@gmail.com>
5319L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
5320T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
5321S: Maintained
5322
5323MMP2 SUPPORT (aka ARMADA610)
5324M: Haojian Zhuang <haojian.zhuang@marvell.com> 5315M: Haojian Zhuang <haojian.zhuang@marvell.com>
5325M: Eric Miao <eric.y.miao@gmail.com>
5326L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 5316L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
5327T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git 5317T: git git://github.com/hzhuang1/linux.git
5318T: git git://git.linaro.org/people/ycmiao/pxa-linux.git
5328S: Maintained 5319S: Maintained
5320F: arch/arm/mach-mmp/
5329 5321
5330PXA MMCI DRIVER 5322PXA MMCI DRIVER
5331S: Orphan 5323S: Orphan