]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commiteadecc133a408064d579f4d5aa4af999dfe1c1b4
tree2b26c155c318d08d946bd2d70cf815dcdb29a243
parentd40bc775eb392884732a99b95f85523cc92d41c6
parentad3c6254bd54d89f35412ec1228fb28994db86da
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