Merge commit 'origin/nodxax' into nolen
authorH. Peter Anvin <hpa@zytor.com>
Tue, 26 Feb 2008 01:30:06 +0000 (17:30 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 26 Feb 2008 01:31:13 +0000 (17:31 -0800)
commit9c7cb70904aff8ce57933934d741163c239879a8
treece003e2628e9ca45eda532a1bf6c3b9f0c97997b
parentdf6f1bd7bd12ae4610c653bef4c184a4f0ccf544
parentb0c3b303f0d2b68ca949191f5fee5c5a2f8acfd0
Merge commit 'origin/nodxax' into nolen

Conflicts:

pxelinux.asm
pxelinux.asm