CVS commit: src/sys/external/bsd/gnu-efi/dist

["Jared D. McNeill" <jmcneill%netbsd.org@localhost>]

Module Name:    src
Committed By:   jmcneill
Date:           Thu Aug 16 18:22:05 UTC 2018

Modified Files:
        src/sys/external/bsd/gnu-efi/dist/inc: efiapi.h efidef.h efistdarg.h
        src/sys/external/bsd/gnu-efi/dist/inc/ia32: efibind.h
        src/sys/external/bsd/gnu-efi/dist/inc/ia64: efibind.h
        src/sys/external/bsd/gnu-efi/dist/inc/x86_64: efibind.h
        src/sys/external/bsd/gnu-efi/dist/lib: dpath.c event.c hand.c hw.c

Log Message:
Merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/gnu-efi/dist/inc/efiapi.h \
    src/sys/external/bsd/gnu-efi/dist/inc/efidef.h \
    src/sys/external/bsd/gnu-efi/dist/inc/efistdarg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/gnu-efi/dist/inc/ia32/efibind.h
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/gnu-efi/dist/inc/ia64/efibind.h
cvs rdiff -u -r1.2 -r1.3 \
    src/sys/external/bsd/gnu-efi/dist/inc/x86_64/efibind.h
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/gnu-efi/dist/lib/dpath.c \
    src/sys/external/bsd/gnu-efi/dist/lib/event.c \
    src/sys/external/bsd/gnu-efi/dist/lib/hw.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/gnu-efi/dist/lib/hand.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.