Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel

1 files changed, 15 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index fb94addb34de..acd124f8000d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -653,6 +653,8 @@ M:	laforge@openezx.org
 L:      openezx-devel@lists.openezx.org (subscribers-only)
 W:      http://www.openezx.org/
 S:      Maintained
+T:      topgit git://git.openezx.org/openezx.git
+F:      arch/arm/mach-pxa/ezx.c
 
 ARM/FARADAY FA526 PORT
 P:      Paulius Zaleckas
@@ -774,6 +776,13 @@ P:	Philipp Zabel
 M:      philipp.zabel@gmail.com
 S:      Maintained
 
+ARM/MIOA701 MACHINE SUPPORT
+P:      Robert Jarzmik
+M:      robert.jarzmik@free.fr
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+F:      arch/arm/mach-pxa/mioa701.c
+S:      Maintained
+
 ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
 P:      Michael Petchkovsky
 M:      mkpetch@internode.on.net
@@ -792,6 +801,12 @@ M:	marek.vasut@gmail.com
 W:      http://hackndev.com
 S:      Maintained
 
+ARM/PALM TREO 680 SUPPORT
+P:      Tomas Cech
+M:      sleep_walker@suse.cz
+W:      http://hackndev.com
+S:      Maintained
+
 ARM/PALMZ72 SUPPORT
 P:      Sergey Lapin
 M:      slapin@ossfans.org