From: Russell King Date: Sat, 12 Jul 2008 20:42:04 +0000 (+0100) Subject: Merge branches 'pxa-ian' and 'pxa-xm270' into pxa X-Git-Tag: v2.6.27-rc1~850^2^2~17 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a9da4f7ed6a702996ac9d1bbaf1a3969a4c092b3;p=linux-2.6-omap-h63xx.git Merge branches 'pxa-ian' and 'pxa-xm270' into pxa Conflicts: MAINTAINERS --- a9da4f7ed6a702996ac9d1bbaf1a3969a4c092b3 diff --cc MAINTAINERS index 8a5ffef6697,c68a1189140,99e531b0f2b..3b228e2d12e --- a/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