Merge branch 'perf/core' of ssh://k/pub/scm/linux/kernel/git/acme/linux into perf...
authorIngo Molnar <mingo@elte.hu>
Fri, 3 Jun 2011 08:43:03 +0000 (10:43 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 3 Jun 2011 08:43:03 +0000 (10:43 +0200)

Trivial merge