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

Merge branch 'pxa-tosa' into pxa

Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/tosa.c
	arch/arm/mach-pxa/spitz.c
---

7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b
Reading git-diff-tree failed