git.stricted.de - GitHub/exynos8895/android_kernel_samsung

author	Ingo Molnar <mingo@elte.hu>
	Sat, 6 Sep 2008 12:53:01 +0000 (14:53 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Sat, 6 Sep 2008 12:53:01 +0000 (14:53 +0200)
commit	046fd53773cd87125f799b00422e487bf1428d38
tree	f379644e8ef8a1ce3ac09802794bd19c854265a6	tree \| snapshot (tar.gz zip)
parent	70bb08962ea9bd50797ae9f16b2493f5f7c65053	commit \| diff
parent	4ab4ba32aa16b012cb0faabf1a27952508fe67f2	commit \| diff
parent	fe47784ba5cbb6b713c013e046859946789b45e4	commit \| diff
parent	8d7ccaa545490cdffdfaff0842436a8dd85cf47b	commit \| diff

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>

arch/x86/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/x86/kernel/cpu/mtrr/main.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/x86/kernel/process_32.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/x86/kernel/process_64.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/x86/kernel/ptrace.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/x86/kernel/signal_32.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/x86/kernel/signal_64.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
arch/x86/mm/ioremap.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/asm-x86/apic.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/asm-x86/e820.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/asm-x86/hw_irq.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/asm-x86/i387.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/asm-x86/io.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/asm-x86/io_64.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/asm-x86/kvm_host.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/asm-x86/page_32.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/asm-x86/page_64.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/asm-x86/pgtable.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/asm-x86/pgtable_32.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/asm-x86/processor.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/asm-x86/ptrace.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/asm-x86/setup.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/asm-x86/signal.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/asm-x86/smp.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/asm-x86/thread_info.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/asm-x86/time.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/asm-x86/timer.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/asm-x86/traps.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history