diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 14:20:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 14:20:39 -0800 |
| commit | 57e964e1ae9bd4f699ae1074430bcf81a9a11377 (patch) | |
| tree | 8c1fc5199e18a55cece4aa72bbaf2ca909bd1453 /MAINTAINERS | |
| parent | 4dee6b64ee7cfef94b47733c6d9fef07f8051c7c (diff) | |
| parent | 39fbc76272225fb991ffdfac1e08974506cfa3eb (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-- | MAINTAINERS | 22 |
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/ PXA2xx/PXA3xx SUPPORT M: Eric Miao <eric.y.miao@gmail.com> M: Russell King <linux@arm.linux.org.uk> +M: Haojian Zhuang <haojian.zhuang@marvell.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +T: git git://github.com/hzhuang1/linux.git +T: git git://git.linaro.org/people/ycmiao/pxa-linux.git S: Maintained F: arch/arm/mach-pxa/ F: drivers/pcmcia/pxa2xx* @@ -5307,25 +5310,14 @@ F: include/sound/pxa2xx-lib.h F: sound/arm/pxa* F: sound/soc/pxa -PXA168 SUPPORT -M: Eric Miao <eric.y.miao@gmail.com> -M: Jason Chagas <jason.chagas@marvell.com> -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git -S: Maintained - -PXA910 SUPPORT +MMP SUPPORT M: Eric Miao <eric.y.miao@gmail.com> -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git -S: Maintained - -MMP2 SUPPORT (aka ARMADA610) M: Haojian Zhuang <haojian.zhuang@marvell.com> -M: Eric Miao <eric.y.miao@gmail.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git +T: git git://github.com/hzhuang1/linux.git +T: git git://git.linaro.org/people/ycmiao/pxa-linux.git S: Maintained +F: arch/arm/mach-mmp/ PXA MMCI DRIVER S: Orphan |