Merge branch 'perf/urgent' of git://github.com/acmel/linux into perf/urgent
authorIngo Molnar <mingo@elte.hu>
Wed, 7 Dec 2011 22:23:44 +0000 (23:23 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 7 Dec 2011 22:23:44 +0000 (23:23 +0100)

Trivial merge