Merge remote branch 'sha0/for_hpa'syslinux-4.02-pre3
commitd083811efff31d3dec9ca95fb3380b72274e85ef
authorH. Peter Anvin <hpa@linux.intel.com>
Mon, 19 Jul 2010 17:48:15 +0000 (19 10:48 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Mon, 19 Jul 2010 17:48:15 +0000 (19 10:48 -0700)
tree536a8103d7029bc6fa855ef00e92a5273273a1c9
parent9c2baed55c657e68b5d2aa7de7557eccfc74eb6b
parente514447e3a4506468b1d066b3bd00f0d32df265a
Merge remote branch 'sha0/for_hpa'