Merge branch 'linus' into x86/header-guards
authorIngo Molnar <mingo@elte.hu>
Sat, 26 Jul 2008 13:30:40 +0000 (15:30 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 26 Jul 2008 13:30:40 +0000 (15:30 +0200)
commit1503af661947b7a4a09355cc2ae6aa0d43f16776
tree5bfcfadf2dd2d98c2ad251c96d7ee43a6903819a
parenta31863168660c6b6f6c7ffe05bb6a38e97803326
parent024e8ac04453b3525448c31ef39848cf675ba6db
Merge branch 'linus' into x86/header-guards

Conflicts:

include/asm-x86/gpio.h
include/asm-x86/ide.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
19 files changed:
arch/x86/boot/compressed/misc.c
include/asm-x86/gpio.h
include/asm-x86/hugetlb.h
include/asm-x86/i387.h
include/asm-x86/io_32.h
include/asm-x86/io_64.h
include/asm-x86/ipi.h
include/asm-x86/page.h
include/asm-x86/paravirt.h
include/asm-x86/pgtable-3level.h
include/asm-x86/pgtable.h
include/asm-x86/pgtable_32.h
include/asm-x86/pgtable_64.h
include/asm-x86/processor-flags.h
include/asm-x86/processor.h
include/asm-x86/thread_info.h
include/asm-x86/unistd_32.h
include/asm-x86/unistd_64.h
include/asm-x86/xen/page.h