diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 17:20:39 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 17:20:39 -0500 |
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/ | |||
5297 | PXA2xx/PXA3xx SUPPORT | 5297 | PXA2xx/PXA3xx SUPPORT |
5298 | M: Eric Miao <eric.y.miao@gmail.com> | 5298 | M: Eric Miao <eric.y.miao@gmail.com> |
5299 | M: Russell King <linux@arm.linux.org.uk> | 5299 | M: Russell King <linux@arm.linux.org.uk> |
5300 | M: Haojian Zhuang <haojian.zhuang@marvell.com> | ||
5300 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 5301 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
5302 | T: git git://github.com/hzhuang1/linux.git | ||
5303 | T: git git://git.linaro.org/people/ycmiao/pxa-linux.git | ||
5301 | S: Maintained | 5304 | S: Maintained |
5302 | F: arch/arm/mach-pxa/ | 5305 | F: arch/arm/mach-pxa/ |
5303 | F: drivers/pcmcia/pxa2xx* | 5306 | F: drivers/pcmcia/pxa2xx* |
@@ -5307,25 +5310,14 @@ F: include/sound/pxa2xx-lib.h | |||
5307 | F: sound/arm/pxa* | 5310 | F: sound/arm/pxa* |
5308 | F: sound/soc/pxa | 5311 | F: sound/soc/pxa |
5309 | 5312 | ||
5310 | PXA168 SUPPORT | 5313 | MMP SUPPORT |
5311 | M: Eric Miao <eric.y.miao@gmail.com> | ||
5312 | M: Jason Chagas <jason.chagas@marvell.com> | ||
5313 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | ||
5314 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git | ||
5315 | S: Maintained | ||
5316 | |||
5317 | PXA910 SUPPORT | ||
5318 | M: Eric Miao <eric.y.miao@gmail.com> | 5314 | M: Eric Miao <eric.y.miao@gmail.com> |
5319 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | ||
5320 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git | ||
5321 | S: Maintained | ||
5322 | |||
5323 | MMP2 SUPPORT (aka ARMADA610) | ||
5324 | M: Haojian Zhuang <haojian.zhuang@marvell.com> | 5315 | M: Haojian Zhuang <haojian.zhuang@marvell.com> |
5325 | M: Eric Miao <eric.y.miao@gmail.com> | ||
5326 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 5316 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
5327 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git | 5317 | T: git git://github.com/hzhuang1/linux.git |
5318 | T: git git://git.linaro.org/people/ycmiao/pxa-linux.git | ||
5328 | S: Maintained | 5319 | S: Maintained |
5320 | F: arch/arm/mach-mmp/ | ||
5329 | 5321 | ||
5330 | PXA MMCI DRIVER | 5322 | PXA MMCI DRIVER |
5331 | S: Orphan | 5323 | S: Orphan |