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

projects / platform / upstream / syslinux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d0a8343 9ce3e9c)

author	H. Peter Anvin <hpa@zytor.com>
	Thu, 28 Jan 2010 00:16:14 +0000 (16:16 -0800)
committer	H. Peter Anvin <hpa@zytor.com>
	Thu, 28 Jan 2010 00:16:14 +0000 (16:16 -0800)
commit	ad8aa52f919cbcadeaf9b60609e5a93ea22b0bf1
tree	174a3f1dcc1376cf1c462350f37bd82ed315bed7	tree \| snapshot
parent	d0a8343ebe29573f92f6a33abcbfe7415bf4e2cf	commit \| diff
parent	9ce3e9ca7775032be2bad8ce80fd72eb60af7d69	commit \| diff

Merge branch 'master' into fsc

Resolved Conflicts:
core/ldlinux.asm

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

core/runkernel.inc

Domain: System / Base;