Merge remote-tracking branch 'genec/diag-mbr-handoff-for-hpa' syslinux-4.04-pre16
authorH. Peter Anvin <hpa@linux.intel.com>
Fri, 1 Apr 2011 22:51:49 +0000 (15:51 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Fri, 1 Apr 2011 22:51:49 +0000 (15:51 -0700)

Trivial merge