Merge branch 'linus' into perf/urgent
authorIngo Molnar <mingo@elte.hu>
Fri, 5 Aug 2011 08:32:54 +0000 (10:32 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 5 Aug 2011 08:33:55 +0000 (10:33 +0200)
Merge reason: Include most of the merge window trees, to do fixes on top.

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

Trivial merge