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

projects / profile / ivi / syslinux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2380682 89ec5fa)

author	H. Peter Anvin <hpa@zytor.com>
	Thu, 21 May 2009 23:17:52 +0000 (16:17 -0700)
committer	H. Peter Anvin <hpa@zytor.com>
	Thu, 21 May 2009 23:17:52 +0000 (16:17 -0700)
commit	e22d7eeaf36c4150354cfe536045bb2ed5b17d83
tree	b0ab539d6e44a4eb95b6eb7de6fdb0603315d191	tree \| snapshot
parent	2380682b7fb14bfbf1e1ff90c4b204c3621dc2d2	commit \| diff
parent	89ec5fa741f415296c6d6c83da5bad32710aaa38	commit \| diff

Merge branch 'master' into core32

Conflicts:
core/idle.inc

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

core/conio.inc	diff1 \|	diff2 \|	blob \| history
core/highmem.inc	diff1 \|	diff2 \|	blob \| history
core/idle.inc	diff1 \|	diff2 \|	blob \| history
core/isolinux.asm	diff1 \|	diff2 \|	blob \| history
core/pxelinux.asm	diff1 \|	diff2 \|	blob \| history
core/ui.inc	diff1 \|	diff2 \|	blob \| history

Domain: System / Uncategorized;