From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 5 Jan 2011 18:09:03 +0000 (+0000)
Subject: Merge branch 'clksrc' into devel
X-Git-Tag: v2.6.38-rc1~471^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58daf18cdcab550262a5f4681e1f1e073e21965a;p=pandora-kernel.git

Merge branch 'clksrc' into devel

Conflicts:
	arch/arm/mach-vexpress/v2m.c
	arch/arm/plat-omap/counter_32k.c
	arch/arm/plat-versatile/Makefile
---

58daf18cdcab550262a5f4681e1f1e073e21965a
Reading git-diff-tree failed