Merge branch 'master' into core32
authorH. Peter Anvin <hpa@zytor.com>
Fri, 29 May 2009 22:16:22 +0000 (15:16 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 29 May 2009 22:16:22 +0000 (15:16 -0700)
commit5e6aef0b866b1e5c1c458cc8ca2a52092928fb0d
treed88795d0d3aba72776a20bf8ee4c8778815df3d0
parentdcd9ae222c665a56a57a560be62b407a04573e13
parent8833b1c37f7ecfa41e0e2c26e72c2913d5eba969
Merge branch 'master' into core32

Conflicts:
com32/include/netinet/in.h
com32/include/sys/cpu.h
dos/argv.c
dos/malloc.c
dos/syslinux.c
extlinux/main.c
libinstaller/setadv.c
libinstaller/syslinux.h
libinstaller/syslxint.h
libinstaller/syslxmod.c
linux/syslinux.c
mtools/syslinux.c
win32/syslinux.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
14 files changed:
com32/include/netinet/in.h
com32/include/sys/cpu.h
dos/argv.c
dos/malloc.c
dos/stdlib.h
dos/syslinux.c
extlinux/main.c
libinstaller/setadv.c
libinstaller/syslinux.h
libinstaller/syslxint.h
libinstaller/syslxmod.c
linux/syslinux.c
mtools/syslinux.c
win32/syslinux.c