Merge branch 'x86/cpu' into x86/xsave
authorH. Peter Anvin <hpa@zytor.com>
Thu, 4 Sep 2008 16:04:45 +0000 (09:04 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 4 Sep 2008 16:04:45 +0000 (09:04 -0700)
Conflicts:

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


Trivial merge