Merge branch 'x86/alternatives' into x86/core
authorIngo Molnar <mingo@elte.hu>
Fri, 5 Sep 2008 15:03:17 +0000 (17:03 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 5 Sep 2008 15:03:17 +0000 (17:03 +0200)

Trivial merge