Merge branches 'pxa-ian' and 'pxa-xm270' into pxa

Conflicts:

	MAINTAINERS

diff --cc MAINTAINERS
index 8a5ffef,c68a118,99e531b..3b228e2
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
+++ b/MAINTAINERS
@@@@ -475,28 -475,17 -475,23 +475,34 @@@@ M:    kernel@wantstofly.or
   L:   linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
   S:   Maintained
   
+++ARM/COMPULAB CM-X270/EM-X270 MACHINE SUPPORT
+++P:   Mike Rapoport
+++M:   mike@compulab.co.il
+++L:   linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+++S:   Maintained
+++
   ARM/CORGI MACHINE SUPPORT
   P:   Richard Purdie
   M:   rpurdie@rpsys.net
   S:   Maintained
   
+++ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
+++P:   Daniel Ribeiro
+++M:   drwyrm@gmail.com
+++P:   Stefan Schmidt
+++M:   stefan@openezx.org
+++P:   Harald Welte
+++M:   laforge@openezx.org
+++L:   openezx-devel@lists.openezx.org (subscribers-only)
+++W:   http://www.openezx.org/
+++S:   Maintained
+++
   ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
   P:   Lennert Buytenhek
   M:   kernel@wantstofly.org
   L:   linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
   S:   Maintained
   
-  ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
-  P: Daniel Ribeiro
-  M: drwyrm@gmail.com
-  P: Stefan Schmidt
-  M: stefan@openezx.org
-  P: Harald Welte
-  M: laforge@openezx.org
-  L: openezx-devel@lists.openezx.org (subscribers-only)
-  W: http://www.openezx.org/
-  S: Maintained
  -ARM/COMPULAB CM-X270/EM-X270 MACHINE SUPPORT
  -P:   Mike Rapoport
  -M:   mike@compulab.co.il
  -L:   linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
  -S:   Maintained
- -
   ARM/GUMSTIX MACHINE SUPPORT
   P:   Steve Sakoman
   M:   sakoman@gmail.com