From: Matt Fleming <matt.fleming@linux.intel.com>
Date: Tue, 7 Jun 2011 19:06:01 +0000 (+0100)
Subject: Merge branch 'pxelinux' into for-hpa/elflink/ldlinux
X-Git-Tag: syslinux-5.00-pre1~42
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d89bda4a721e7e0299fe4fc88ee6e45be989819c;p=platform%2Fupstream%2Fsyslinux.git

Merge branch 'pxelinux' into for-hpa/elflink/ldlinux

Conflicts:
	core/pxelinux.asm
---

d89bda4a721e7e0299fe4fc88ee6e45be989819c