git.stricted.de - GitHub/exynos8895/android_kernel_samsung_universal8895.git/commit

projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 046fd53 dc44e65)

author	Ingo Molnar <mingo@elte.hu>
	Sat, 6 Sep 2008 12:53:20 +0000 (14:53 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Sat, 6 Sep 2008 12:53:20 +0000 (14:53 +0200)
commit	f12e6a451aad671a724e61abce2b8b323f209355
tree	e4969282d07f7682099291e59545744b3bb5dcac	tree \| snapshot (tar.gz zip)
parent	046fd53773cd87125f799b00422e487bf1428d38	commit \| diff
parent	dc44e65943169de2d1a1b494876f48a65a9737f1	commit \| diff

Merge branch 'x86/cleanups' into x86/signal

Conflicts:
arch/x86/kernel/signal_64.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

13 files changed:

arch/x86/boot/compressed/misc.c	diff1 \|	diff2 \|	blob \| history
arch/x86/ia32/ia32_signal.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/acpi/boot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/sigframe.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/signal_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/sys_x86_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps_64.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/apic.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/asm.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/elf.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/resume-trace.h	diff1 \|	diff2 \|	blob \| history