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

projects / platform / upstream / syslinux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d6fb086 dcecb9f)

author	H. Peter Anvin <hpa@linux.intel.com>
	Tue, 30 Mar 2010 23:17:59 +0000 (16:17 -0700)
committer	H. Peter Anvin <hpa@linux.intel.com>
	Tue, 30 Mar 2010 23:17:59 +0000 (16:17 -0700)
commit	52c9d5ba2af4e1f77aa2486a2af2bcab0b0af52c
tree	0ef759bffc55ed0f7811805440f58412e6ba3d8f	tree \| snapshot
parent	d6fb0861c55f062797c8706f484bd47ae0f94568	commit \| diff
parent	dcecb9f395f3ca0da3df774cb6102d885894bf84	commit \| diff

Merge branch 'master' into pathbased

Resolved Conflicts:
com32/modules/Makefile
core/comboot.inc
core/cpuinit.inc
core/idle.inc

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

com32/modules/Makefile	diff1 \|	diff2 \|	blob \| history
core/conio.inc	diff1 \|	diff2 \|	blob \| history
core/diskstart.inc	diff1 \|	diff2 \|	blob \| history
core/pxelinux.asm	diff1 \|	diff2 \|	blob \| history
core/ui.inc	diff1 \|	diff2 \|	blob \| history
doc/comboot.txt	diff1 \|	diff2 \|	blob \| history

Domain: System / Base;