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)
commitbc85e585c6d0fab4bde12d60964b2f25802c3163
tree80f5fe916e3458d0676e595e3433a0313e7ba72b
parent186f93ea1f274f4cde4a356401c1786c818ff881
parent796d12959ad374cae8eb77faaf4243455a305433
Merge branch 'perf' into devel

Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig