Merge branch 'core32' into fsc

author H. Peter Anvin <hpa@zytor.com>

Sun, 9 Aug 2009 21:44:34 +0000 (14:44 -0700)

committer H. Peter Anvin <hpa@zytor.com>

Sun, 9 Aug 2009 21:44:34 +0000 (14:44 -0700)
author H. Peter Anvin <hpa@zytor.com>
Sun, 9 Aug 2009 21:44:34 +0000 (14:44 -0700)
committer H. Peter Anvin <hpa@zytor.com>
Sun, 9 Aug 2009 21:44:34 +0000 (14:44 -0700)
diff --cc core/Makefile
Simple merge
diff --cc core/parsecmd.inc
Simple merge
diff --cc core/pxelinux.asm
Simple merge
author	H. Peter Anvin <hpa@zytor.com>
	Sun, 9 Aug 2009 21:44:34 +0000 (14:44 -0700)
committer	H. Peter Anvin <hpa@zytor.com>
	Sun, 9 Aug 2009 21:44:34 +0000 (14:44 -0700)
		1	2
core/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
core/parsecmd.inc	patch \|	diff1 \|	diff2 \|	blob \| history
core/pxelinux.asm	patch \|	diff1 \|	diff2 \|	blob \| history