Merge branch 'linus' into perf/core
authorIngo Molnar <mingo@elte.hu>
Fri, 22 Apr 2011 08:19:26 +0000 (10:19 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 22 Apr 2011 08:19:30 +0000 (10:19 +0200)
Merge reason: Pick up upstream fixes.

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

Trivial merge