Merge branch 'linus' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Mon, 7 Dec 2009 12:14:12 +0000 (13:14 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 7 Dec 2009 12:14:18 +0000 (13:14 +0100)
Merge reason: we want to queue up a dependent fix.

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

Trivial merge