Merge commit 'origin/nolen' into gpxe-support
authorH. Peter Anvin <hpa@zytor.com>
Sun, 23 Mar 2008 00:25:31 +0000 (17:25 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Sun, 23 Mar 2008 00:25:31 +0000 (17:25 -0700)
commit51455f8e30fbf4ec689de70e14fe607284d8c6ec
tree7119c4f4546ae530349a3fb70b1b5a95f031ae8c
parent6768925b9974a22bf40c7415fe26e9b8c8e3119f
parent6af0d32f7773c2bc45a45fe246dc2fcaf9d18207
Merge commit 'origin/nolen' into gpxe-support

Conflicts:

NEWS
dnsresolv.inc
pxelinux.asm
NEWS
pxelinux.asm