git.stricted.de - GitHub/LineageOS/android_kernel_motorola_exynos9610.git/commit

projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cec5eb7 e6babb6)

author	Ingo Molnar <mingo@elte.hu>
	Tue, 23 Sep 2008 11:26:27 +0000 (13:26 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 23 Sep 2008 11:26:27 +0000 (13:26 +0200)
commit	101d5b713700b902b1c200cdd1925c3cb7d34567
tree	a0d4b4140129ad2f24fd17b965dfcfbbb1ac01db	tree \| snapshot (tar.gz zip)
parent	cec5eb7be3a104fffd27ca967ee8e15a123050e2	commit \| diff
parent	e6babb6b7fed93c93f8fc5ef8ebd3a474fc2df3e	commit \| diff

Merge branch 'x86/signal' into core/signal

Conflicts:
arch/x86/kernel/cpu/feature_names.c
arch/x86/kernel/setup.c
drivers/pci/intel-iommu.c
include/asm-x86/cpufeature.h

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

arch/x86/Kconfig.cpu	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/common.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/common_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/cyrix.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/enlighten.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/cpufeature.h	diff1 \|	diff2 \|	blob \| history