Merge branch 'x86/urgent' into x86/mce2
authorH. Peter Anvin <hpa@linux.intel.com>
Mon, 23 Feb 2009 22:05:56 +0000 (14:05 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Mon, 23 Feb 2009 22:05:56 +0000 (14:05 -0800)

Trivial merge