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

projects / profile / ivi / syslinux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 078bd1b b583906)

author	H. Peter Anvin <hpa@zytor.com>
	Tue, 29 Dec 2009 01:38:48 +0000 (17:38 -0800)
committer	H. Peter Anvin <hpa@zytor.com>
	Tue, 29 Dec 2009 01:38:48 +0000 (17:38 -0800)
commit	22d83c14f4d916e65ffee040468a7f944fdd30d7
tree	0396b906e78c6f21a55b20b932df95b36caa148f	tree \| snapshot
parent	078bd1b56a512c1dac52020d23382c1bdb37056d	commit \| diff
parent	b5839067e5fa11af7e76a6f6f87ef914ba9913d1	commit \| diff

Merge commit 'liu/master' into fsc

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

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

core/diskstart.inc	diff1 \|	diff2 \|	blob \| history
core/fs.c	diff1 \|	diff2 \|	blob \| history
core/fs/ext2/ext2.c	diff1 \|	diff2 \|	blob \| history
core/fs/pxe/pxe.c	diff1 \|	diff2 \|	blob \| history
core/include/fs.h	diff1 \|	diff2 \|	blob \| history

Domain: System / Uncategorized;