From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sat, 12 Jul 2008 20:43:36 +0000 (+0100)
Subject: Merge branch 'eseries' into pxa
X-Git-Tag: v2.6.27-rc1~850^2^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a58d4bb66b1d68e4b9319dd5b89078bad2a7f64;p=pandora-kernel.git

Merge branch 'eseries' into pxa

Conflicts:

	arch/arm/mach-pxa/Makefile
---

5a58d4bb66b1d68e4b9319dd5b89078bad2a7f64
Reading git-diff-tree failed