diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-14 11:00:16 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-14 11:00:16 +0100 |
| commit | 4c31791c3d9d38ac052dd5e2981df713d8f3dcc4 (patch) | |
| tree | b7f95922b2f1da5b36d95176e6d8f826151f3ee1 /MAINTAINERS | |
| parent | 98797a241e28b787b84d308b867ec4c5fe7bbdf8 (diff) | |
| parent | 7517b3fbe40c231d79d36f31c1e9930cbb8c4be2 (diff) | |
| download | linux-4c31791c3d9d38ac052dd5e2981df713d8f3dcc4.tar.gz linux-4c31791c3d9d38ac052dd5e2981df713d8f3dcc4.tar.bz2 linux-4c31791c3d9d38ac052dd5e2981df713d8f3dcc4.zip | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 581fedcce2b5..1ab1b7f4e4c5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -680,6 +680,13 @@ M: sakoman@gmail.com L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) S: Maintained +ARM/H4700 (HP IPAQ HX4700) MACHINE SUPPORT +P: Philipp Zabel +M: philipp.zabel@gmail.com +S: Maintained +F: arch/arm/mach-pxa/hx4700.c +F: arch/arm/mach-pxa/include/mach/hx4700.h + ARM/HP JORNADA 7XX MACHINE SUPPORT P: Kristoffer Ericson M: kristoffer.ericson@gmail.com @@ -4627,7 +4634,7 @@ F: drivers/media/video/pvrusb2/ PXA2xx/PXA3xx SUPPORT P: Eric Miao -M: eric.miao@marvell.com +M: eric.y.miao@gmail.com P: Russell King M: linux@arm.linux.org.uk L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) @@ -4641,19 +4648,19 @@ F: sound/soc/pxa/pxa2xx* PXA168 SUPPORT P: Eric Miao -M: eric.miao@marvell.com +M: eric.y.miao@gmail.com P: Jason Chagas M: jason.chagas@marvell.com L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git -S: Supported +S: Maintained PXA910 SUPPORT P: Eric Miao -M: eric.miao@marvell.com +M: eric.y.miao@gmail.com L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git -S: Supported +S: Maintained PXA MMCI DRIVER S: Orphan |