From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 25 Feb 2010 22:09:22 +0000 (+0000)
Subject: Merge branch 'perf' into devel
X-Git-Tag: v2.6.34-rc1~241^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc85e585c6d0fab4bde12d60964b2f25802c3163;p=pandora-kernel.git

Merge branch 'perf' into devel

Conflicts:
	arch/arm/Kconfig
---

bc85e585c6d0fab4bde12d60964b2f25802c3163
Reading git-diff-tree failed