Merge branch 'perf' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 25 Feb 2010 22:09:22 +0000 (22:09 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 25 Feb 2010 22:09:22 +0000 (22:09 +0000)
Conflicts:
arch/arm/Kconfig


Trivial merge