git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic_linux-4.9.git/commit

projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: da7878d fb2e405)

author	Ingo Molnar <mingo@elte.hu>
	Fri, 25 Jul 2008 09:37:07 +0000 (11:37 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 25 Jul 2008 09:37:07 +0000 (11:37 +0200)
commit	0e2f65ee30eee2db054f7fd73f462c5da33ec963
tree	26c61eb7745da0c0d9135e9d12088f570cb8530d	tree \| snapshot (tar.gz zip)
parent	da7878d75b8520c9ae00d27dfbbce546a7bfdfbb	commit \| diff
parent	fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43	commit \| diff

Merge branch 'linus' into x86/pebs

Conflicts:

arch/x86/Kconfig.cpu
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/setup_64.c

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

arch/x86/Kconfig.cpu	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/intel.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/ptrace.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/processor.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/ptrace-abi.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/ptrace.h	diff1 \|	diff2 \|	blob \| history