Merge commit 'origin/master' into adv syslinux-3.60-pre6
authorH. Peter Anvin <hpa@zytor.com>
Tue, 18 Dec 2007 23:58:13 +0000 (15:58 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 18 Dec 2007 23:58:13 +0000 (15:58 -0800)
commit808b03603854aede50b7ebd09129053ab4025113
tree84f535337de360bb3fc644596678aea56d35c086
parentcbcc195e1ac4d7b4f4c3a37b51fa3c58db14269b
parent8fd5e917a23b6ba2d1bf9128be3524ca8cf8ab34
Merge commit 'origin/master' into adv
Makefile
NEWS
doc/comboot.doc
doc/extlinux.doc