Merge branch 'pxelinux' into for-hpa/elflink/ldlinux
authorMatt Fleming <matt.fleming@linux.intel.com>
Tue, 7 Jun 2011 19:06:01 +0000 (20:06 +0100)
committerMatt Fleming <matt.fleming@linux.intel.com>
Tue, 7 Jun 2011 19:06:01 +0000 (20:06 +0100)
commitd89bda4a721e7e0299fe4fc88ee6e45be989819c
tree5ea4ae8fcbefd0c5e52edee55b24c0cff18b783a
parentba4fefa9b52b25ca1babd77066e21abef19518c2
parentd8ce3aad1f66e69d66c7f04834c91f181f160cf9
Merge branch 'pxelinux' into for-hpa/elflink/ldlinux

Conflicts:
core/pxelinux.asm
core/include/core.h