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

projects / platform / upstream / syslinux.git / commit

author	Pierre-Alexandre Meyer <pierre@mouraf.org>
	Wed, 5 Aug 2009 03:23:16 +0000 (20:23 -0700)
committer	Pierre-Alexandre Meyer <pierre@mouraf.org>
	Wed, 5 Aug 2009 04:01:32 +0000 (21:01 -0700)
commit	0b19aba1d072ab3a2d9f528d7f0042dc8bc9e0ca
tree	eb93c4db28c463d98cf520e3235e7357f870c0e8	tree \| snapshot
parent	a6b80d3e8a356a55b4365c5e402e502843bbff8c	commit \| diff
parent	8e01231be41fd889bcb71604dbda511688ed0f38	commit \| diff

Merge commit 'hpa/master' into for-erwan

Conflicts:
com32/cmenu/libmenu/com32io.h
com32/gplinclude/dmi/dmi.h
com32/gplinclude/dmi/dmi_base_board.h
com32/gplinclude/dmi/dmi_memory.h
com32/gplinclude/dmi/dmi_system.h
com32/gpllib/dmi/dmi.c
com32/gpllib/dmi/dmi_memory.c
com32/include/sys/pci.h
com32/lib/pci/scan.c
com32/modules/Makefile

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>

Domain: System / Base;

RSS Atom

com32/cmenu/libmenu/com32io.h	diff1 \|	diff2 \|	blob \| history
com32/gplinclude/dmi/dmi.h	diff1 \|	diff2 \|	blob \| history
com32/gplinclude/dmi/dmi_base_board.h	diff1 \|	diff2 \|	blob \| history
com32/gplinclude/dmi/dmi_memory.h	diff1 \|	diff2 \|	blob \| history
com32/gplinclude/dmi/dmi_system.h	diff1 \|	diff2 \|	blob \| history
com32/gpllib/dmi/dmi.c	diff1 \|	diff2 \|	blob \| history
com32/gpllib/dmi/dmi_memory.c	diff1 \|	diff2 \|	blob \| history
com32/hdt/hdt-cli-pci.c	diff1 \|	diff2 \|	blob \| history
com32/include/sys/pci.h	diff1 \|	diff2 \|	blob \| history
com32/lib/pci/scan.c	diff1 \|	diff2 \|	blob \| history
com32/modules/Makefile	diff1 \|	diff2 \|	blob \| history