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

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

Module Name:    src
Committed By:   christos
Date:           Fri Dec 27 18:50:58 UTC 2013

Modified Files:
        src/sys/external/bsd/acpica/dist/common: dmtbinfo.c
        src/sys/external/bsd/acpica/dist/compiler: aslcompile.c asltree.c
            aslutils.c
        src/sys/external/bsd/acpica/dist/debugger: dbcmds.c dbdisply.c dbexec.c
            dbinput.c dbutils.c
        src/sys/external/bsd/acpica/dist/disassembler: dmresrc.c dmresrcl.c
        src/sys/external/bsd/acpica/dist/dispatcher: dscontrol.c dsopcode.c
        src/sys/external/bsd/acpica/dist/events: 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 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
            acpiosxf.h acpixf.h acresrc.h actables.h actbl1.h actypes.h
            acutils.h
        src/sys/external/bsd/acpica/dist/include/platform: 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/parser: psopcode.c psopinfo.c
        src/sys/external/bsd/acpica/dist/resources: rsdump.c rsutils.c
            rsxface.c
        src/sys/external/bsd/acpica/dist/tables: tbfadt.c tbinstal.c tbutils.c
            tbxface.c tbxfroot.c
        src/sys/external/bsd/acpica/dist/utilities: utcache.c utdebug.c
            utdecode.c uteval.c utglobal.c utmisc.c utmutex.c utosi.c uttrack.c
Removed Files:
        src/sys/external/bsd/acpica/dist: README
        src/sys/external/bsd/acpica/dist/compiler: Makefile
        src/sys/external/bsd/acpica/dist/tools/acpibin: Makefile
        src/sys/external/bsd/acpica/dist/tools/acpiexec: Makefile
        src/sys/external/bsd/acpica/dist/tools/acpihelp: Makefile ahpredef.c
        src/sys/external/bsd/acpica/dist/tools/acpinames: Makefile
        src/sys/external/bsd/acpica/dist/tools/acpisrc: Makefile
        src/sys/external/bsd/acpica/dist/tools/acpixtract: Makefile

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 src/sys/external/bsd/acpica/dist/README
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/acpica/dist/common/dmtbinfo.c
cvs rdiff -u -r1.1.1.3 -r0 src/sys/external/bsd/acpica/dist/compiler/Makefile
cvs rdiff -u -r1.3 -r1.4 \
    src/sys/external/bsd/acpica/dist/compiler/aslcompile.c
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/acpica/dist/compiler/asltree.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/acpica/dist/compiler/aslutils.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/acpica/dist/debugger/dbcmds.c
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/acpica/dist/debugger/dbdisply.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/acpica/dist/debugger/dbexec.c \
    src/sys/external/bsd/acpica/dist/debugger/dbinput.c \
    src/sys/external/bsd/acpica/dist/debugger/dbutils.c
cvs rdiff -u -r1.3 -r1.4 \
    src/sys/external/bsd/acpica/dist/disassembler/dmresrc.c \
    src/sys/external/bsd/acpica/dist/disassembler/dmresrcl.c
cvs rdiff -u -r1.2 -r1.3 \
    src/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c
cvs rdiff -u -r1.3 -r1.4 \
    src/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/acpica/dist/events/evrgnini.c \
    src/sys/external/bsd/acpica/dist/events/evxface.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/acpica/dist/executer/exconfig.c \
    src/sys/external/bsd/acpica/dist/executer/exdebug.c \
    src/sys/external/bsd/acpica/dist/executer/exdump.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/sys/external/bsd/acpica/dist/hardware/hwesleep.c \
    src/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
    src/sys/external/bsd/acpica/dist/hardware/hwsleep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/acpica/dist/include/acapps.h \
    src/sys/external/bsd/acpica/dist/include/acinterp.h \
    src/sys/external/bsd/acpica/dist/include/acmacros.h \
    src/sys/external/bsd/acpica/dist/include/acnamesp.h \
    src/sys/external/bsd/acpica/dist/include/acresrc.h \
    src/sys/external/bsd/acpica/dist/include/actables.h \
    src/sys/external/bsd/acpica/dist/include/actbl1.h
cvs rdiff -u -r1.4 -r1.5 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/acpiosxf.h \
    src/sys/external/bsd/acpica/dist/include/actypes.h
cvs rdiff -u -r1.1.1.3 -r1.2 \
    src/sys/external/bsd/acpica/dist/include/acexcep.h
cvs rdiff -u -r1.5 -r1.6 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/platform/acnetbsd.h
cvs rdiff -u -r1.3 -r1.4 \
    src/sys/external/bsd/acpica/dist/namespace/nsaccess.c \
    src/sys/external/bsd/acpica/dist/namespace/nsdump.c \
    src/sys/external/bsd/acpica/dist/namespace/nseval.c \
    src/sys/external/bsd/acpica/dist/namespace/nsinit.c \
    src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c \
    src/sys/external/bsd/acpica/dist/namespace/nsxfname.c
cvs rdiff -u -r1.4 -r1.5 \
    src/sys/external/bsd/acpica/dist/namespace/nsrepair2.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/acpica/dist/parser/psopcode.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/sys/external/bsd/acpica/dist/parser/psopinfo.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/acpica/dist/resources/rsdump.c \
    src/sys/external/bsd/acpica/dist/resources/rsutils.c \
    src/sys/external/bsd/acpica/dist/resources/rsxface.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/acpica/dist/tables/tbfadt.c \
    src/sys/external/bsd/acpica/dist/tables/tbutils.c \
    src/sys/external/bsd/acpica/dist/tables/tbxfroot.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
    src/sys/external/bsd/acpica/dist/tables/tbinstal.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/acpica/dist/tables/tbxface.c
cvs rdiff -u -r1.1.1.1 -r0 \
    src/sys/external/bsd/acpica/dist/tools/acpibin/Makefile
cvs rdiff -u -r1.1.1.3 -r0 \
    src/sys/external/bsd/acpica/dist/tools/acpiexec/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
    src/sys/external/bsd/acpica/dist/tools/acpihelp/Makefile \
    src/sys/external/bsd/acpica/dist/tools/acpihelp/ahpredef.c
cvs rdiff -u -r1.1.1.2 -r0 \
    src/sys/external/bsd/acpica/dist/tools/acpinames/Makefile
cvs rdiff -u -r1.1.1.3 -r0 \
    src/sys/external/bsd/acpica/dist/tools/acpisrc/Makefile
cvs rdiff -u -r1.1.1.3 -r0 \
    src/sys/external/bsd/acpica/dist/tools/acpixtract/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/acpica/dist/utilities/utcache.c \
    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/utmisc.c \
    src/sys/external/bsd/acpica/dist/utilities/uttrack.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/acpica/dist/utilities/utdebug.c \
    src/sys/external/bsd/acpica/dist/utilities/utdecode.c
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/acpica/dist/utilities/utmutex.c \
    src/sys/external/bsd/acpica/dist/utilities/utosi.c

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