From: Russell King <rmk@dyn-67.arm.linux.org.uk>
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://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9da4f7ed6a702996ac9d1bbaf1a3969a4c092b3;p=pandora-kernel.git

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

Conflicts:

	MAINTAINERS
---

a9da4f7ed6a702996ac9d1bbaf1a3969a4c092b3
Reading git-diff-tree failed