Merge branch 'master' of git://git.kernel.org/pub/scm/boot/syslinux/syslinux into...
authorErwan Velu <erwan.velu@free.fr>
Thu, 23 Apr 2009 19:10:32 +0000 (21:10 +0200)
committerErwan Velu <erwan.velu@free.fr>
Thu, 23 Apr 2009 19:10:32 +0000 (21:10 +0200)
commit75c9aef767d9ab556c92e6e50a0ca0b61b898916
treef6148cadbdaa0f47e02d3e1b9c59c6ae1221e8cb
parent98bd2d140d31e5ce4b83589a546a70183a22b4e1
parent6af3d0ea72a6f6852bda7519278a0c6fdd16d2b5
Merge branch 'master' of git://git./boot/syslinux/syslinux into mainline

Conflicts:
com32/hdt/hdt-cli-pci.c
com32/hdt/hdt-cli-vesa.c
com32/hdt/hdt-common.c
com32/hdt/hdt-menu-dmi.c
com32/hdt/hdt-cli-pci.c