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)
Conflicts:

arch/x86/kernel/cpu/cyrix.c


Trivial merge