tree 1394eb320916b4e5604761dbc8ae1a9bc1903602
parent 42390cdec5f6e6e2ee54f308474a6ef7dd16aa5c
parent af2e1f276ff08f17192411ea3b71c13a758dfe12
author H. Peter Anvin <hpa@zytor.com> 1220545281 -0700
committer H. Peter Anvin <hpa@zytor.com> 1220545281 -0700

Merge branch 'x86/cpu' into x86/x2apic

Conflicts:

	arch/x86/kernel/cpu/feature_names.c
	include/asm-x86/cpufeature.h