tree a0d4b4140129ad2f24fd17b965dfcfbbb1ac01db
parent cec5eb7be3a104fffd27ca967ee8e15a123050e2
parent e6babb6b7fed93c93f8fc5ef8ebd3a474fc2df3e
author Ingo Molnar <mingo@elte.hu> 1222169187 +0200
committer Ingo Molnar <mingo@elte.hu> 1222169187 +0200

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>