Merge branch 'perf/core' of git://github.com/acmel/linux into perf/core
authorIngo Molnar <mingo@elte.hu>
Mon, 10 Oct 2011 05:10:05 +0000 (07:10 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 10 Oct 2011 05:10:05 +0000 (07:10 +0200)

Trivial merge