Merge branch 'core' of git://amd64.org/linux/rric into perf/core
authorIngo Molnar <mingo@elte.hu>
Thu, 29 Sep 2011 15:35:29 +0000 (17:35 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 29 Sep 2011 15:35:29 +0000 (17:35 +0200)

Trivial merge