Merge commit 'origin/master' into adv

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

Tue, 18 Dec 2007 23:58:13 +0000 (15:58 -0800)

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

Tue, 18 Dec 2007 23:58:13 +0000 (15:58 -0800)
author H. Peter Anvin <hpa@zytor.com>
Tue, 18 Dec 2007 23:58:13 +0000 (15:58 -0800)
committer H. Peter Anvin <hpa@zytor.com>
Tue, 18 Dec 2007 23:58:13 +0000 (15:58 -0800)
diff --cc Makefile
Simple merge
diff --cc NEWS
Simple merge
diff --cc doc/comboot.doc
Simple merge
diff --cc doc/extlinux.doc
Simple merge
author	H. Peter Anvin <hpa@zytor.com>
	Tue, 18 Dec 2007 23:58:13 +0000 (15:58 -0800)
committer	H. Peter Anvin <hpa@zytor.com>
	Tue, 18 Dec 2007 23:58:13 +0000 (15:58 -0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
doc/comboot.doc	patch \|	diff1 \|	diff2 \|	blob \| history
doc/extlinux.doc	patch \|	diff1 \|	diff2 \|	blob \| history