Skip to content
Commit 101d5b71 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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: default avatarIngo Molnar <mingo@elte.hu>
parents cec5eb7b e6babb6b
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment