Merge remote branch 'sha0/memdskprobe'
authorH. Peter Anvin <hpa@linux.intel.com>
Wed, 26 Jan 2011 00:56:20 +0000 (16:56 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Wed, 26 Jan 2011 00:56:20 +0000 (16:56 -0800)

Trivial merge