Merge branches 'x86/tracehook', 'x86/xsave' and 'x86/prototypes' into x86/signal
authorIngo Molnar <mingo@elte.hu>
Sat, 6 Sep 2008 12:53:01 +0000 (14:53 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 6 Sep 2008 12:53:01 +0000 (14:53 +0200)
commit046fd53773cd87125f799b00422e487bf1428d38
treef379644e8ef8a1ce3ac09802794bd19c854265a6
parent70bb08962ea9bd50797ae9f16b2493f5f7c65053
parent4ab4ba32aa16b012cb0faabf1a27952508fe67f2
parentfe47784ba5cbb6b713c013e046859946789b45e4
parent8d7ccaa545490cdffdfaff0842436a8dd85cf47b
Merge branches 'x86/tracehook', 'x86/xsave' and 'x86/prototypes' into x86/signal

Conflicts:
arch/x86/kernel/signal_64.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
29 files changed:
arch/x86/Kconfig
arch/x86/kernel/cpu/mtrr/main.c
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
arch/x86/kernel/ptrace.c
arch/x86/kernel/signal_32.c
arch/x86/kernel/signal_64.c
arch/x86/kernel/smpboot.c
arch/x86/mm/ioremap.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/kvm_host.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/thread_info.h
include/asm-x86/time.h
include/asm-x86/timer.h
include/asm-x86/traps.h