Merge branch 'x86/urgent' into auto-latest
authorIngo Molnar <mingo@elte.hu>
Mon, 23 May 2011 14:09:41 +0000 (16:09 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 23 May 2011 14:09:41 +0000 (16:09 +0200)

Trivial merge