From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 9 Oct 2008 20:33:02 +0000 (+0100)
Subject: Merge branch 'pxa-all' into devel
X-Git-Tag: v2.6.28-rc1~293^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f30a09a612bac2b531a206c2a58a292dd7ff182;p=pandora-kernel.git

Merge branch 'pxa-all' into devel

Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/corgi.c
	arch/arm/mach-pxa/include/mach/hardware.h
	arch/arm/mach-pxa/spitz.c
---

3f30a09a612bac2b531a206c2a58a292dd7ff182
Reading git-diff-tree failed