Merge branch 'perf/core' of git://github.com/acmel/linux into perf/core
authorIngo Molnar <mingo@elte.hu>
Tue, 20 Dec 2011 19:32:37 +0000 (20:32 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 20 Dec 2011 19:32:37 +0000 (20:32 +0100)

Trivial merge