Merge branch 'x86/urgent' into x86/cpu
authorH. Peter Anvin <hpa@zytor.com>
Thu, 28 Aug 2008 02:17:07 +0000 (19:17 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 28 Aug 2008 02:17:07 +0000 (19:17 -0700)
commitb30a72a7edfc64c8929104d5c2178aca489aa559
tree2b26c155c318d08d946bd2d70cf815dcdb29a243
parentf1c5d30e1d79bbfb60eaf189db862d3cb2bcac92
parentc1b362e3b4d331a63915b268a33207311a439d60
Merge branch 'x86/urgent' into x86/cpu

Conflicts:

arch/x86/kernel/cpu/cyrix.c
arch/x86/boot/cpucheck.c
arch/x86/kernel/cpu/cyrix.c
include/asm-x86/cpufeature.h