Merge remote branch 'sha0/mdiskchk_enh2' into pathbased
authorH. Peter Anvin <hpa@linux.intel.com>
Thu, 17 Jun 2010 18:41:15 +0000 (11:41 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Thu, 17 Jun 2010 18:41:15 +0000 (11:41 -0700)

Trivial merge