Merge branch 'x86/urgent' into x86/cleanups
authorH. Peter Anvin <hpa@zytor.com>
Tue, 26 Aug 2008 05:45:37 +0000 (22:45 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 26 Aug 2008 05:45:37 +0000 (22:45 -0700)

Trivial merge