Merge remote-tracking branch 'genec/diag-mbr-fix-for-hpa'
authorH. Peter Anvin <hpa@zytor.com>
Sun, 27 May 2012 19:57:01 +0000 (12:57 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Sun, 27 May 2012 19:57:01 +0000 (12:57 -0700)

Trivial merge