Merge branch 'linus' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Fri, 18 Mar 2011 09:38:53 +0000 (10:38 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 18 Mar 2011 09:39:00 +0000 (10:39 +0100)
Merge reason: Merge upstream commits to avoid conflicts in upcoming patches.

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

Trivial merge