review.tizen.org Git - profile/ivi/syslinux.git/commit

projects / profile / ivi / syslinux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0622cf1 390a4bf)

author	H. Peter Anvin <hpa@zytor.com>
	Sat, 4 Apr 2009 22:00:34 +0000 (15:00 -0700)
committer	H. Peter Anvin <hpa@zytor.com>
	Sat, 4 Apr 2009 22:00:34 +0000 (15:00 -0700)
commit	2cd336282f7b3411cf6f384d82487a11e1ccfc1e
tree	9977477d71edcbde1dd382aaa131c03fafee232a	tree \| snapshot
parent	0622cf1442f4f04c12ad91e0652b97f2a01c1e93	commit \| diff
parent	390a4bf409a4574fe3272adf9f873ef78b78c167	commit \| diff

Merge branch 'master' into new-shuffler

Conflicts:
com32/lib/syslinux/memmap.c

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

com32/lib/syslinux/memmap.c	diff1 \|	diff2 \|	blob \| history
com32/lib/syslinux/shuffle.c	diff1 \|	diff2 \|	blob \| history
core/bootsect.inc	diff1 \|	diff2 \|	blob \| history
core/com32.inc	diff1 \|	diff2 \|	blob \| history
core/comboot.inc	diff1 \|	diff2 \|	blob \| history
core/runkernel.inc	diff1 \|	diff2 \|	blob \| history
doc/comboot.txt	diff1 \|	diff2 \|	blob \| history

Domain: System / Uncategorized;