Merge branch 'linus' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Mon, 12 May 2008 20:29:14 +0000 (22:29 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 12 May 2008 20:29:14 +0000 (22:29 +0200)

Trivial merge