Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core
authorIngo Molnar <mingo@elte.hu>
Thu, 14 Aug 2008 12:58:22 +0000 (14:58 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 14 Aug 2008 12:58:22 +0000 (14:58 +0200)
commitc83d12806b6185131ece682de8696d8cfb78df69
tree6eb639a6746b0e3c2aa1e57f3a9ee5eea6dfc793
parent51ca3c679194e7435c25b8e77b0a73c597e41ae9
parent8d7ccaa545490cdffdfaff0842436a8dd85cf47b
parent8067794bec1cc5de1431102cf0a6a1c7ce75cd85
parenta677f58a8c8c541bf7d02c658545084040f3708d
Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core
23 files changed:
arch/x86/kernel/io_apic_32.c
arch/x86/kernel/setup_percpu.c
arch/x86/kernel/signal_64.c
arch/x86/kernel/smpboot.c
arch/x86/mach-default/setup.c
include/asm-x86/apic.h
include/asm-x86/e820.h
include/asm-x86/hw_irq.h
include/asm-x86/i387.h
include/asm-x86/io.h
include/asm-x86/io_64.h
include/asm-x86/page_32.h
include/asm-x86/page_64.h
include/asm-x86/pgtable.h
include/asm-x86/pgtable_32.h
include/asm-x86/processor.h
include/asm-x86/ptrace.h
include/asm-x86/setup.h
include/asm-x86/signal.h
include/asm-x86/smp.h
include/asm-x86/time.h
include/asm-x86/timer.h
include/asm-x86/traps.h