From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sun, 14 Jun 2009 10:01:44 +0000 (+0100)
Subject: Merge branch 'u300' into devel
X-Git-Tag: v2.6.31-rc1~344^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc;p=pandora-kernel.git

Merge branch 'u300' into devel

Conflicts:
	arch/arm/Makefile
Updates:
	arch/arm/mach-u300/core.c
	arch/arm/mach-u300/timer.c
---

b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc
Reading git-diff-tree failed