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

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

Module Name:    src
Committed By:   christos
Date:           Wed Jan 25 13:38:23 UTC 2017

Modified Files:
        src/sys/external/bsd/acpica/dist/common: dmtbdump.c dmtbinfo.c
        src/sys/external/bsd/acpica/dist/compiler: aslanalyze.c aslcompile.c
            aslcompiler.h aslcompiler.l aslerror.c aslfileio.c aslfiles.c
            aslload.c asllookup.c aslopcodes.c aslopt.c asloptions.c
            aslpredef.c aslprepkg.c aslsupport.l asltree.c aslutils.c
            aslwalks.c aslxref.c dtcompile.c dtfield.c dtparser.y dtsubtable.c
            dttable.c dtutils.c prparser.y prutils.c
        src/sys/external/bsd/acpica/dist/debugger: dbcmds.c dbdisply.c dbexec.c
            dbinput.c dbmethod.c dbnames.c dbtest.c dbutils.c
        src/sys/external/bsd/acpica/dist/disassembler: dmbuffer.c dmcstyle.c
            dmresrc.c dmresrcl.c dmresrcl2.c dmwalk.c
        src/sys/external/bsd/acpica/dist/dispatcher: dscontrol.c dsopcode.c
            dsutils.c
        src/sys/external/bsd/acpica/dist/events: evregion.c evrgnini.c
            evxface.c
        src/sys/external/bsd/acpica/dist/executer: exconfig.c exdebug.c
            exdump.c
        src/sys/external/bsd/acpica/dist/hardware: hwesleep.c hwregs.c
            hwsleep.c hwxfsleep.c
        src/sys/external/bsd/acpica/dist/include: acapps.h acdebug.h acdisasm.h
            acexcep.h acglobal.h acinterp.h aclocal.h acmacros.h acnamesp.h
            acoutput.h acpiosxf.h acpixf.h acresrc.h actables.h actbl1.h
            actypes.h acutils.h
        src/sys/external/bsd/acpica/dist/include/platform: acgcc.h acnetbsd.h
        src/sys/external/bsd/acpica/dist/namespace: nsaccess.c nsdump.c
            nseval.c nsinit.c nsrepair2.c nsxfeval.c nsxfname.c
        src/sys/external/bsd/acpica/dist/os_specific/service_layers:
            oslinuxtbl.c
        src/sys/external/bsd/acpica/dist/parser: psopcode.c psopinfo.c
        src/sys/external/bsd/acpica/dist/resources: rsdump.c rsdumpinfo.c
            rsutils.c rsxface.c
        src/sys/external/bsd/acpica/dist/tables: tbdata.c tbfadt.c tbinstal.c
            tbutils.c tbxface.c tbxfload.c tbxfroot.c
        src/sys/external/bsd/acpica/dist/tools/acpidump: apfiles.c
        src/sys/external/bsd/acpica/dist/tools/acpixtract: acpixtract.c
        src/sys/external/bsd/acpica/dist/utilities: utcache.c utdebug.c
            utdecode.c uteval.c utglobal.c utmisc.c utmutex.c utobject.c
            utosi.c utprint.c uttrack.c utuuid.c

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/acpica/dist/common/dmtbdump.c
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/acpica/dist/common/dmtbinfo.c
cvs rdiff -u -r1.7 -r1.8 \
    src/sys/external/bsd/acpica/dist/compiler/aslanalyze.c \
    src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l \
    src/sys/external/bsd/acpica/dist/compiler/aslfiles.c \
    src/sys/external/bsd/acpica/dist/compiler/asllookup.c \
    src/sys/external/bsd/acpica/dist/compiler/aslprepkg.c \
    src/sys/external/bsd/acpica/dist/compiler/asltree.c \
    src/sys/external/bsd/acpica/dist/compiler/dtcompile.c \
    src/sys/external/bsd/acpica/dist/compiler/dtfield.c \
    src/sys/external/bsd/acpica/dist/compiler/dtutils.c \
    src/sys/external/bsd/acpica/dist/compiler/prutils.c
cvs rdiff -u -r1.9 -r1.10 \
    src/sys/external/bsd/acpica/dist/compiler/aslcompile.c
cvs rdiff -u -r1.6 -r1.7 \
    src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h \
    src/sys/external/bsd/acpica/dist/compiler/aslerror.c \
    src/sys/external/bsd/acpica/dist/compiler/aslfileio.c \
    src/sys/external/bsd/acpica/dist/compiler/aslload.c \
    src/sys/external/bsd/acpica/dist/compiler/aslopcodes.c \
    src/sys/external/bsd/acpica/dist/compiler/aslpredef.c \
    src/sys/external/bsd/acpica/dist/compiler/aslsupport.l \
    src/sys/external/bsd/acpica/dist/compiler/aslwalks.c \
    src/sys/external/bsd/acpica/dist/compiler/dtsubtable.c
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/acpica/dist/compiler/aslopt.c \
    src/sys/external/bsd/acpica/dist/compiler/asloptions.c
cvs rdiff -u -r1.15 -r1.16 \
    src/sys/external/bsd/acpica/dist/compiler/aslutils.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/acpica/dist/compiler/aslxref.c \
    src/sys/external/bsd/acpica/dist/compiler/dtparser.y \
    src/sys/external/bsd/acpica/dist/compiler/dttable.c \
    src/sys/external/bsd/acpica/dist/compiler/prparser.y
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/acpica/dist/debugger/dbcmds.c \
    src/sys/external/bsd/acpica/dist/debugger/dbutils.c
cvs rdiff -u -r1.11 -r1.12 \
    src/sys/external/bsd/acpica/dist/debugger/dbdisply.c \
    src/sys/external/bsd/acpica/dist/debugger/dbexec.c
cvs rdiff -u -r1.12 -r1.13 \
    src/sys/external/bsd/acpica/dist/debugger/dbinput.c
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/acpica/dist/debugger/dbmethod.c \
    src/sys/external/bsd/acpica/dist/debugger/dbnames.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/acpica/dist/debugger/dbtest.c
cvs rdiff -u -r1.6 -r1.7 \
    src/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c \
    src/sys/external/bsd/acpica/dist/disassembler/dmcstyle.c \
    src/sys/external/bsd/acpica/dist/disassembler/dmwalk.c
cvs rdiff -u -r1.7 -r1.8 \
    src/sys/external/bsd/acpica/dist/disassembler/dmresrc.c \
    src/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c
cvs rdiff -u -r1.8 -r1.9 \
    src/sys/external/bsd/acpica/dist/disassembler/dmresrcl.c
cvs rdiff -u -r1.6 -r1.7 \
    src/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c \
    src/sys/external/bsd/acpica/dist/dispatcher/dsutils.c
cvs rdiff -u -r1.7 -r1.8 \
    src/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/acpica/dist/events/evregion.c
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/acpica/dist/events/evrgnini.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/acpica/dist/events/evxface.c
cvs rdiff -u -r1.10 -r1.11 \
    src/sys/external/bsd/acpica/dist/executer/exconfig.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/acpica/dist/executer/exdebug.c
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/acpica/dist/executer/exdump.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/acpica/dist/hardware/hwesleep.c \
    src/sys/external/bsd/acpica/dist/hardware/hwsleep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/acpica/dist/hardware/hwregs.c
cvs rdiff -u -r1.7 -r1.8 \
    src/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/acpica/dist/include/acapps.h \
    src/sys/external/bsd/acpica/dist/include/actables.h \
    src/sys/external/bsd/acpica/dist/include/actbl1.h
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/acpica/dist/include/acdebug.h \
    src/sys/external/bsd/acpica/dist/include/acdisasm.h \
    src/sys/external/bsd/acpica/dist/include/aclocal.h \
    src/sys/external/bsd/acpica/dist/include/acmacros.h \
    src/sys/external/bsd/acpica/dist/include/actypes.h
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/acpica/dist/include/acexcep.h
cvs rdiff -u -r1.13 -r1.14 \
    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.8 -r1.9 src/sys/external/bsd/acpica/dist/include/acinterp.h \
    src/sys/external/bsd/acpica/dist/include/acresrc.h
cvs rdiff -u -r1.10 -r1.11 \
    src/sys/external/bsd/acpica/dist/include/acnamesp.h \
    src/sys/external/bsd/acpica/dist/include/acpiosxf.h
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/acpica/dist/include/acoutput.h
cvs rdiff -u -r1.3 -r1.4 \
    src/sys/external/bsd/acpica/dist/include/platform/acgcc.h
cvs rdiff -u -r1.14 -r1.15 \
    src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h
cvs rdiff -u -r1.9 -r1.10 \
    src/sys/external/bsd/acpica/dist/namespace/nsaccess.c \
    src/sys/external/bsd/acpica/dist/namespace/nseval.c \
    src/sys/external/bsd/acpica/dist/namespace/nsrepair2.c \
    src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c
cvs rdiff -u -r1.10 -r1.11 \
    src/sys/external/bsd/acpica/dist/namespace/nsdump.c
cvs rdiff -u -r1.11 -r1.12 \
    src/sys/external/bsd/acpica/dist/namespace/nsinit.c
cvs rdiff -u -r1.8 -r1.9 \
    src/sys/external/bsd/acpica/dist/namespace/nsxfname.c
cvs rdiff -u -r1.6 -r1.7 \
    src/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/acpica/dist/parser/psopcode.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/acpica/dist/parser/psopinfo.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/acpica/dist/resources/rsdump.c \
    src/sys/external/bsd/acpica/dist/resources/rsxface.c
cvs rdiff -u -r1.6 -r1.7 \
    src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c
cvs rdiff -u -r1.9 -r1.10 \
    src/sys/external/bsd/acpica/dist/resources/rsutils.c
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/acpica/dist/tables/tbdata.c
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/acpica/dist/tables/tbfadt.c \
    src/sys/external/bsd/acpica/dist/tables/tbxface.c
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/acpica/dist/tables/tbinstal.c
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/acpica/dist/tables/tbutils.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/acpica/dist/tables/tbxfload.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/acpica/dist/tables/tbxfroot.c
cvs rdiff -u -r1.7 -r1.8 \
    src/sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c
cvs rdiff -u -r1.7 -r1.8 \
    src/sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c
cvs rdiff -u -r1.9 -r1.10 \
    src/sys/external/bsd/acpica/dist/utilities/utcache.c \
    src/sys/external/bsd/acpica/dist/utilities/utmisc.c
cvs rdiff -u -r1.12 -r1.13 \
    src/sys/external/bsd/acpica/dist/utilities/utdebug.c
cvs rdiff -u -r1.10 -r1.11 \
    src/sys/external/bsd/acpica/dist/utilities/utdecode.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/acpica/dist/utilities/uteval.c \
    src/sys/external/bsd/acpica/dist/utilities/utglobal.c \
    src/sys/external/bsd/acpica/dist/utilities/utosi.c
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/acpica/dist/utilities/utmutex.c
cvs rdiff -u -r1.2 -r1.3 \
    src/sys/external/bsd/acpica/dist/utilities/utobject.c \
    src/sys/external/bsd/acpica/dist/utilities/utprint.c
cvs rdiff -u -r1.11 -r1.12 \
    src/sys/external/bsd/acpica/dist/utilities/uttrack.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/acpica/dist/utilities/utuuid.c

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