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)
commit801493c2e249a7314e9e8e54ad60d613d0a86f14
treec8f77ce14e76abec848366812a0aad0fad4f539c
parent939ddcfa60dabfaed390987bf0103a6654c0fe30
parent74ea15d909b31158f9b63190a95b52bc05586d4b
Merge branch 'linus' into perf/core

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>