Merge branch 'core/header-fixes' into x86/headers
authorIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 20:05:03 +0000 (21:05 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 20:05:03 +0000 (21:05 +0100)
Conflicts:
arch/x86/include/asm/setup.h


Trivial merge