Merge branch 'x86/header-guards' into x86/core
authorIngo Molnar <mingo@elte.hu>
Sat, 26 Jul 2008 14:28:36 +0000 (16:28 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 26 Jul 2008 14:28:36 +0000 (16:28 +0200)

Trivial merge