From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sun, 13 Jul 2008 11:05:49 +0000 (+0100)
Subject: Merge branch 'pxa' into devel
X-Git-Tag: v2.6.27-rc1~850^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=044e5f45e4ad890d03bd1e8bb44c634397cac24d;p=pandora-kernel.git

Merge branch 'pxa' into devel

Conflicts:

	arch/arm/configs/em_x270_defconfig
	arch/arm/configs/xm_x270_defconfig
---

044e5f45e4ad890d03bd1e8bb44c634397cac24d
Reading git-diff-tree failed