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

projects / profile / ivi / syslinux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 66faa55 942aade)

author	H. Peter Anvin <hpa@zytor.com>
	Mon, 25 May 2009 22:50:12 +0000 (15:50 -0700)
committer	H. Peter Anvin <hpa@zytor.com>
	Mon, 25 May 2009 22:50:12 +0000 (15:50 -0700)
commit	12f1c65e7748559aef772cfe760be11f1f7745fa
tree	140317122ecc0862a3006f534de4fee5c38b8c1e	tree \| snapshot
parent	66faa55d9decdea13f3be830e9999c23574a34c5	commit \| diff
parent	942aadea9468884dfbc2a7c8428f52bbb5ecf360	commit \| diff

Merge branch 'master' into core32

Conflicts:
com32/MCONFIG

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

Domain: System / Uncategorized;