delta/syslinux.git/com32/cmenu, branch thread git.kernel.org: pub/scm/boot/syslinux/syslinux.git Merge commit 'hpa/master' into for-erwan 2009-08-05T04:01:32+00:00 Pierre-Alexandre Meyer pierre@mouraf.org 2009-08-05T03:23:16+00:00 0b19aba1d072ab3a2d9f528d7f0042dc8bc9e0ca 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> 
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>
Run Nindent on com32/cmenu/simple.c 2009-05-29T22:10:20+00:00 H. Peter Anvin hpa@zytor.com 2009-05-29T22:10:20+00:00 14b44f22241785ae6c6eaca236916c9d6d9da4c1 Automatically reformat com32/cmenu/simple.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 com32/cmenu/simple.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>
Run Nindent on com32/cmenu/libmenu/tui.h 2009-05-29T22:10:20+00:00 H. Peter Anvin hpa@zytor.com 2009-05-29T22:10:20+00:00 c70547f6be05bf7f030278fb32da9e32efc135e1 Automatically reformat com32/cmenu/libmenu/tui.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> 
Automatically reformat com32/cmenu/libmenu/tui.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>
Run Nindent on com32/cmenu/libmenu/tui.c 2009-05-29T22:10:20+00:00 H. Peter Anvin hpa@zytor.com 2009-05-29T22:10:20+00:00 9ee1ad8cb45892b15ee191f9e7d9e460646f06b6 Automatically reformat com32/cmenu/libmenu/tui.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 com32/cmenu/libmenu/tui.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>
Run Nindent on com32/cmenu/libmenu/syslnx.h 2009-05-29T22:10:20+00:00 H. Peter Anvin hpa@zytor.com 2009-05-29T22:10:20+00:00 8fddece8f9ec6b801d21379763125a72e811d507 Automatically reformat com32/cmenu/libmenu/syslnx.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> 
Automatically reformat com32/cmenu/libmenu/syslnx.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>
Run Nindent on com32/cmenu/libmenu/syslnx.c 2009-05-29T22:10:20+00:00 H. Peter Anvin hpa@zytor.com 2009-05-29T22:10:20+00:00 88a901de6c90307298ae2c9548eb0244e10586eb Automatically reformat com32/cmenu/libmenu/syslnx.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 com32/cmenu/libmenu/syslnx.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>
Run Nindent on com32/cmenu/libmenu/scancodes.h 2009-05-29T22:10:20+00:00 H. Peter Anvin hpa@zytor.com 2009-05-29T22:10:20+00:00 ef11da7691ba91699f1ab707735c617614cd274f Automatically reformat com32/cmenu/libmenu/scancodes.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> 
Automatically reformat com32/cmenu/libmenu/scancodes.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>
Run Nindent on com32/cmenu/libmenu/passwords.h 2009-05-29T22:10:20+00:00 H. Peter Anvin hpa@zytor.com 2009-05-29T22:10:20+00:00 c4fb0e48855482b029a0a6484083e78fe21c0cce Automatically reformat com32/cmenu/libmenu/passwords.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> 
Automatically reformat com32/cmenu/libmenu/passwords.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>
Run Nindent on com32/cmenu/libmenu/passwords.c 2009-05-29T22:10:20+00:00 H. Peter Anvin hpa@zytor.com 2009-05-29T22:10:20+00:00 82142038970dc91f99777146f8d0862d6a5b5b86 Automatically reformat com32/cmenu/libmenu/passwords.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 com32/cmenu/libmenu/passwords.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>
Run Nindent on com32/cmenu/libmenu/menu.h 2009-05-29T22:10:20+00:00 H. Peter Anvin hpa@zytor.com 2009-05-29T22:10:20+00:00 1ef30e32e5777914e5f9f73fce76c252a9536b5e Automatically reformat com32/cmenu/libmenu/menu.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> 
Automatically reformat com32/cmenu/libmenu/menu.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>