Merge branch 'linus' into perf/core
authorIngo Molnar <mingo@elte.hu>
Fri, 27 Jan 2012 11:01:41 +0000 (12:01 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 27 Jan 2012 11:01:43 +0000 (12:01 +0100)
Merge reason: pick up fixes that are upstream, we need them
              because we'll apply dependent patches.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge