Merge branch 'core/header-fixes' into x86/headers
commit22796b15725488002437ebbf98a22fdbe596cf89
authorIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 20:05:03 +0000 (13 21:05 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 20:05:03 +0000 (13 21:05 +0100)
treee6745c9e367e782c0b184eb941e2b86805975f88
parentbf33a70a73876b163d62612e9567cbac6604ba7e
parent0fb807c3e573ff9de2965ca38c907605d4735d16
Merge branch 'core/header-fixes' into x86/headers

Conflicts:
arch/x86/include/asm/setup.h
arch/x86/include/asm/setup.h
arch/x86/include/asm/syscalls.h