Module Name: src Committed By: christos Date: Fri Sep 15 17:10:32 UTC 2017
Modified Files: src/sys/external/bsd/acpica/conf: files.acpica 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 aslload.c asllookup.c aslopcodes.c aslopt.c asloptions.c aslpredef.c aslsupport.l asltree.c aslutils.c aslwalks.c aslxref.c dtcompile.c dtfield.c dtparser.y dtutils.c prparser.y src/sys/external/bsd/acpica/dist/debugger: dbdisply.c dbexec.c src/sys/external/bsd/acpica/dist/disassembler: dmbuffer.c dmresrc.c dmresrcl2.c dmwalk.c src/sys/external/bsd/acpica/dist/dispatcher: dsopcode.c dsutils.c src/sys/external/bsd/acpica/dist/executer: exdebug.c exdump.c src/sys/external/bsd/acpica/dist/hardware: hwregs.c hwxfsleep.c src/sys/external/bsd/acpica/dist/include: acapps.h acdisasm.h acexcep.h acglobal.h acinterp.h aclocal.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 nsinit.c nsxfeval.c src/sys/external/bsd/acpica/dist/os_specific/service_layers: oslinuxtbl.c src/sys/external/bsd/acpica/dist/parser: psopcode.c src/sys/external/bsd/acpica/dist/resources: rsdump.c rsdumpinfo.c rsxface.c src/sys/external/bsd/acpica/dist/tables: tbdata.c tbfadt.c tbinstal.c tbutils.c tbxface.c tbxfload.c src/sys/external/bsd/acpica/dist/tools/acpidump: apfiles.c src/sys/external/bsd/acpica/dist/utilities: utdecode.c utmisc.c utobject.c utprint.c uttrack.c Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/acpica/conf/files.acpica cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/acpica/dist/common/dmtbdump.c cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/acpica/dist/common/dmtbinfo.c cvs rdiff -u -r1.8 -r1.9 \ src/sys/external/bsd/acpica/dist/compiler/aslanalyze.c \ src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h \ src/sys/external/bsd/acpica/dist/compiler/asllookup.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/dtcompile.c \ src/sys/external/bsd/acpica/dist/compiler/dtfield.c \ src/sys/external/bsd/acpica/dist/compiler/dtutils.c cvs rdiff -u -r1.11 -r1.12 \ src/sys/external/bsd/acpica/dist/compiler/aslcompile.c cvs rdiff -u -r1.9 -r1.10 \ src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l \ 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/prparser.y cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/acpica/dist/compiler/aslerror.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 cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/acpica/dist/compiler/aslopt.c cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/acpica/dist/compiler/asloptions.c cvs rdiff -u -r1.10 -r1.11 \ src/sys/external/bsd/acpica/dist/compiler/asltree.c cvs rdiff -u -r1.17 -r1.18 \ src/sys/external/bsd/acpica/dist/compiler/aslutils.c cvs rdiff -u -r1.12 -r1.13 \ src/sys/external/bsd/acpica/dist/debugger/dbdisply.c \ src/sys/external/bsd/acpica/dist/debugger/dbexec.c cvs rdiff -u -r1.7 -r1.8 \ src/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c cvs rdiff -u -r1.8 -r1.9 \ src/sys/external/bsd/acpica/dist/disassembler/dmresrc.c \ src/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c \ src/sys/external/bsd/acpica/dist/disassembler/dmwalk.c cvs rdiff -u -r1.9 -r1.10 \ src/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c cvs rdiff -u -r1.8 -r1.9 \ src/sys/external/bsd/acpica/dist/dispatcher/dsutils.c cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/acpica/dist/executer/exdebug.c cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/acpica/dist/executer/exdump.c cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/acpica/dist/hardware/hwregs.c cvs rdiff -u -r1.8 -r1.9 \ src/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c cvs rdiff -u -r1.10 -r1.11 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.13 -r1.14 \ src/sys/external/bsd/acpica/dist/include/acdisasm.h \ src/sys/external/bsd/acpica/dist/include/aclocal.h cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/acpica/dist/include/acexcep.h cvs rdiff -u -r1.15 -r1.16 \ src/sys/external/bsd/acpica/dist/include/acglobal.h \ src/sys/external/bsd/acpica/dist/include/acpixf.h cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/acpica/dist/include/acinterp.h \ src/sys/external/bsd/acpica/dist/include/acresrc.h cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/acpica/dist/include/actypes.h cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/acpica/dist/include/acutils.h cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/acpica/dist/include/platform/acgcc.h cvs rdiff -u -r1.15 -r1.16 \ src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h cvs rdiff -u -r1.11 -r1.12 \ src/sys/external/bsd/acpica/dist/namespace/nsaccess.c cvs rdiff -u -r1.12 -r1.13 \ src/sys/external/bsd/acpica/dist/namespace/nsinit.c cvs rdiff -u -r1.10 -r1.11 \ src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c cvs rdiff -u -r1.7 -r1.8 \ src/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/acpica/dist/parser/psopcode.c cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/acpica/dist/resources/rsdump.c \ src/sys/external/bsd/acpica/dist/resources/rsxface.c cvs rdiff -u -r1.7 -r1.8 \ src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/acpica/dist/tables/tbdata.c cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/acpica/dist/tables/tbfadt.c \ src/sys/external/bsd/acpica/dist/tables/tbxface.c cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/acpica/dist/tables/tbinstal.c cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/acpica/dist/tables/tbutils.c cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/acpica/dist/tables/tbxfload.c cvs rdiff -u -r1.8 -r1.9 \ src/sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c cvs rdiff -u -r1.11 -r1.12 \ src/sys/external/bsd/acpica/dist/utilities/utdecode.c cvs rdiff -u -r1.10 -r1.11 \ src/sys/external/bsd/acpica/dist/utilities/utmisc.c cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/acpica/dist/utilities/utobject.c \ src/sys/external/bsd/acpica/dist/utilities/utprint.c cvs rdiff -u -r1.12 -r1.13 \ src/sys/external/bsd/acpica/dist/utilities/uttrack.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.