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

Trivial merge