]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit0901110cf87d6fff2a2a6c37badd2457ae8505a4
treee6745c9e367e782c0b184eb941e2b86805975f88
parent80230c382a6c50008548893c89de0aeb44116806
parent9c88e62b622aa7da8f2593ee588d059de35e94ba
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