review.tizen.org Git - platform/upstream/syslinux.git/commit

projects / platform / upstream / syslinux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ebef1cd 259c0dc)

author	H. Peter Anvin <hpa@zytor.com>
	Fri, 6 Nov 2009 01:52:47 +0000 (17:52 -0800)
committer	H. Peter Anvin <hpa@zytor.com>
	Fri, 6 Nov 2009 23:57:15 +0000 (15:57 -0800)
commit	8492da661cc77e26cd18e4cf307b78e50661ea29
tree	d3d19f6c48eef6e6b44982f3d8b2fa993edfe16c	tree \| snapshot
parent	ebef1cd107b7034056309bf49f92a2b9e92b9fe0	commit \| diff
parent	259c0dca1bc6ead6003fc504e136be67a1311abb	commit \| diff

Merge branch 'master' into fsc

Conflicts:
com32/modules/Makefile
core/pxelinux.asm
core/serirq.inc

Note: hardwired options will need to be re-implemented in PXELINUX.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

MCONFIG	diff1 \|	diff2 \|	blob \| history
com32/lib/Makefile	diff1 \|	diff2 \|	blob \| history
com32/modules/Makefile	diff1 \|	diff2 \|	blob \| history
core/localboot.inc	diff1 \|	diff2 \|	blob \| history
core/pxelinux.asm	diff1 \|	diff2 \|	blob \| history
core/runkernel.inc	diff1 \|	diff2 \|	blob \| history
core/serirq.inc	diff1 \|	diff2 \|	blob \| history

Domain: System / Base;