Merge commit 'liu/master'; fix Files[] definition
authorH. Peter Anvin <hpa@zytor.com>
Mon, 10 Aug 2009 23:39:29 +0000 (16:39 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 10 Aug 2009 23:41:10 +0000 (16:41 -0700)
commit710be5ce8bb85a8cfe08acbc242dbee12f6c7871
tree631791084524d5c2ce23168b7891b310820f26f7
parentf87413e6b7a60e9cfc086232953b7f32a4d1c5f2
parentcf68539184ac53fb8a29905e87f5f44f24dbcb37
Merge commit 'liu/master'; fix Files[] definition

Resolved Conflicts:
core/extlinux.asm
core/ldlinux.asm

Merge in liu's changes, but fix Files[] to be a private structure
inside the filesystem, thus we don't have to worry about the
size of it in the assembly code at all.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
core/diskfs.inc
core/ext2.c
core/extlinux.asm
core/fat.c
core/include/core.h
core/include/pxe.h
core/iso9660.c
core/pxe.c
core/pxelinux.asm