Merge branch 'linus' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Tue, 13 May 2008 09:32:58 +0000 (11:32 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 13 May 2008 09:32:58 +0000 (11:32 +0200)

Trivial merge