Resolved Conflicts:
	MCONFIG.embedded
	com32/MCONFIG
	com32/lib/Makefile
	core/Makefile
	core/extern.inc
	core/extlinux.asm
	core/isolinux.asm
	core/syslinux.ld

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

The filesystem code now supports ext4, so support it in the installer
as well.

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

Fix the extlinux installer so we can handle more than one sector of
sector pointers.  This code should be merged with the equivalent code
in the syslinux installer.

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

Remove redundant declaration.

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>

Automatically reformat extlinux/main.c using Nindent.

Do this for all files except HDT, gPXE and externally maintained
libraries (zlib, tinyjpeg, libpng).

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

Automatically reformat extlinux/ext2_fs.h using Nindent.

Do this for all files except HDT, gPXE and externally maintained
libraries (zlib, tinyjpeg, libpng).

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

Use the names SECTOR_SIZE and SECTOR_SHIFT everywhere, instead of an
odd mix of symbols and hard-coded constants.

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