From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Tue, 7 Oct 2008 18:08:56 +0000 (+0100)
Subject: Merge branches 'pxa-core' and 'pxa-machines' into pxa-all
X-Git-Tag: v2.6.28-rc1~293^2~6^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a89770daad83df74d77a8d34a1ffaedae565ce9;p=pandora-kernel.git

Merge branches 'pxa-core' and 'pxa-machines' into pxa-all

Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/pxa25x.c
	arch/arm/mach-pxa/pxa27x.c
---

5a89770daad83df74d77a8d34a1ffaedae565ce9
Reading git-diff-tree failed