From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue, 7 Oct 2008 18:08:35 +0000 (+0100)
Subject: Merge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-im
X-Git-Tag: v2.6.28-rc1~293^2~6^2~17^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=af7c951d76708c61b862463d579d76be757130bf;p=linux-2.6-omap-h63xx.git

Merge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-im

Merge branch 'pxa-eseries' into pxa-machines

Conflicts:

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

af7c951d76708c61b862463d579d76be757130bf