CVS commit: src/sys/external/bsd/acpica/dist

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Mon Jul 18 17:26:12 UTC 2016

Modified Files:
        src/sys/external/bsd/acpica/dist/disassembler: dmwalk.c
        src/sys/external/bsd/acpica/dist/dispatcher: dsutils.c
        src/sys/external/bsd/acpica/dist/hardware: hwregs.c
        src/sys/external/bsd/acpica/dist/include: acglobal.h acmacros.h
            acoutput.h acpixf.h acutils.h
        src/sys/external/bsd/acpica/dist/namespace: nsaccess.c nsdump.c
        src/sys/external/bsd/acpica/dist/utilities: utdebug.c utdecode.c

Log Message:
merge conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
    src/sys/external/bsd/acpica/dist/disassembler/dmwalk.c
cvs rdiff -u -r1.5 -r1.6 \
    src/sys/external/bsd/acpica/dist/dispatcher/dsutils.c
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/acpica/dist/hardware/hwregs.c
cvs rdiff -u -r1.11 -r1.12 \
    src/sys/external/bsd/acpica/dist/include/acglobal.h \
    src/sys/external/bsd/acpica/dist/include/acpixf.h \
    src/sys/external/bsd/acpica/dist/include/acutils.h
cvs rdiff -u -r1.10 -r1.11 \
    src/sys/external/bsd/acpica/dist/include/acmacros.h
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/acpica/dist/include/acoutput.h
cvs rdiff -u -r1.8 -r1.9 \
    src/sys/external/bsd/acpica/dist/namespace/nsaccess.c
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/acpica/dist/namespace/nsdump.c
cvs rdiff -u -r1.10 -r1.11 \
    src/sys/external/bsd/acpica/dist/utilities/utdebug.c
cvs rdiff -u -r1.9 -r1.10 \
    src/sys/external/bsd/acpica/dist/utilities/utdecode.c

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