Merge branch 'core/header-fixes' into x86/headers

Conflicts:
	arch/x86/include/asm/setup.h
This commit is contained in:
Ingo Molnar 2009-02-13 21:05:03 +01:00
commit 22796b1572
36 changed files with 100 additions and 86 deletions