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

projects / platform / upstream / syslinux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5396e25 2dafb84)

author	H. Peter Anvin <hpa@zytor.com>
	Wed, 10 Feb 2010 23:59:46 +0000 (15:59 -0800)
committer	H. Peter Anvin <hpa@zytor.com>
	Wed, 10 Feb 2010 23:59:46 +0000 (15:59 -0800)
commit	e8d0e6fb18aae44474e864d8040d5ed44ff6acab
tree	547115848f342060950112d85b83706ef12fd800	tree \| snapshot
parent	5396e250a679c368b3dd353c730358d6c54960c8	commit \| diff
parent	2dafb8402ed666b37f96f6e1579a99b8a8c85452	commit \| diff

Merge branch 'fsc' into pathbased

Resolved Conflicts:
core/fs/ext2/ext2.c

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

core/fs/ext2/ext2.c	diff1 \|	diff2 \|	blob \| history
core/include/core.h	diff1 \|	diff2 \|	blob \| history
libinstaller/syslxint.h	diff1 \|	diff2 \|	blob \| history
libinstaller/syslxmod.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Base;