Merge branch 'linus' into sched/core
authorIngo Molnar <mingo@kernel.org>
Mon, 7 May 2012 13:03:39 +0000 (15:03 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 7 May 2012 13:03:42 +0000 (15:03 +0200)
Merge reason: We were on a pretty old base, refresh before moving on.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge