--- - branch: MAIN date: Wed Jan 25 13:38:23 UTC 2017 files: - new: '1.7' old: '1.6' path: src/sys/external/bsd/acpica/dist/common/dmtbdump.c pathrev: src/sys/external/bsd/acpica/dist/common/dmtbdump.c@1.7 type: modified - new: '1.12' old: '1.11' path: src/sys/external/bsd/acpica/dist/common/dmtbinfo.c pathrev: src/sys/external/bsd/acpica/dist/common/dmtbinfo.c@1.12 type: modified - new: '1.8' old: '1.7' path: src/sys/external/bsd/acpica/dist/compiler/aslanalyze.c pathrev: src/sys/external/bsd/acpica/dist/compiler/aslanalyze.c@1.8 type: modified - new: '1.8' old: '1.7' path: src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l pathrev: src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l@1.8 type: modified - new: '1.8' old: '1.7' path: src/sys/external/bsd/acpica/dist/compiler/aslfiles.c pathrev: src/sys/external/bsd/acpica/dist/compiler/aslfiles.c@1.8 type: modified - new: '1.8' old: '1.7' path: src/sys/external/bsd/acpica/dist/compiler/asllookup.c pathrev: src/sys/external/bsd/acpica/dist/compiler/asllookup.c@1.8 type: modified - new: '1.8' old: '1.7' path: src/sys/external/bsd/acpica/dist/compiler/aslprepkg.c pathrev: src/sys/external/bsd/acpica/dist/compiler/aslprepkg.c@1.8 type: modified - new: '1.8' old: '1.7' path: src/sys/external/bsd/acpica/dist/compiler/asltree.c pathrev: src/sys/external/bsd/acpica/dist/compiler/asltree.c@1.8 type: modified - new: '1.8' old: '1.7' path: src/sys/external/bsd/acpica/dist/compiler/dtcompile.c pathrev: src/sys/external/bsd/acpica/dist/compiler/dtcompile.c@1.8 type: modified - new: '1.8' old: '1.7' path: src/sys/external/bsd/acpica/dist/compiler/dtfield.c pathrev: src/sys/external/bsd/acpica/dist/compiler/dtfield.c@1.8 type: modified - new: '1.8' old: '1.7' path: src/sys/external/bsd/acpica/dist/compiler/dtutils.c pathrev: src/sys/external/bsd/acpica/dist/compiler/dtutils.c@1.8 type: modified - new: '1.8' old: '1.7' path: src/sys/external/bsd/acpica/dist/compiler/prutils.c pathrev: src/sys/external/bsd/acpica/dist/compiler/prutils.c@1.8 type: modified - new: '1.10' old: '1.9' path: src/sys/external/bsd/acpica/dist/compiler/aslcompile.c pathrev: src/sys/external/bsd/acpica/dist/compiler/aslcompile.c@1.10 type: modified - new: '1.7' old: '1.6' path: src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h pathrev: src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h@1.7 type: modified - new: '1.7' old: '1.6' path: src/sys/external/bsd/acpica/dist/compiler/aslerror.c pathrev: src/sys/external/bsd/acpica/dist/compiler/aslerror.c@1.7 type: modified - new: '1.7' old: '1.6' path: src/sys/external/bsd/acpica/dist/compiler/aslfileio.c pathrev: src/sys/external/bsd/acpica/dist/compiler/aslfileio.c@1.7 type: modified - new: '1.7' old: '1.6' path: src/sys/external/bsd/acpica/dist/compiler/aslload.c pathrev: src/sys/external/bsd/acpica/dist/compiler/aslload.c@1.7 type: modified - new: '1.7' old: '1.6' path: src/sys/external/bsd/acpica/dist/compiler/aslopcodes.c pathrev: src/sys/external/bsd/acpica/dist/compiler/aslopcodes.c@1.7 type: modified - new: '1.7' old: '1.6' path: src/sys/external/bsd/acpica/dist/compiler/aslpredef.c pathrev: src/sys/external/bsd/acpica/dist/compiler/aslpredef.c@1.7 type: modified - new: '1.7' old: '1.6' path: src/sys/external/bsd/acpica/dist/compiler/aslsupport.l pathrev: src/sys/external/bsd/acpica/dist/compiler/aslsupport.l@1.7 type: modified - new: '1.7' old: '1.6' path: src/sys/external/bsd/acpica/dist/compiler/aslwalks.c pathrev: src/sys/external/bsd/acpica/dist/compiler/aslwalks.c@1.7 type: modified - new: '1.7' old: '1.6' path: src/sys/external/bsd/acpica/dist/compiler/dtsubtable.c pathrev: src/sys/external/bsd/acpica/dist/compiler/dtsubtable.c@1.7 type: modified - new: '1.3' old: '1.2' path: src/sys/external/bsd/acpica/dist/compiler/aslopt.c pathrev: src/sys/external/bsd/acpica/dist/compiler/aslopt.c@1.3 type: modified - new: '1.3' old: '1.2' path: src/sys/external/bsd/acpica/dist/compiler/asloptions.c pathrev: src/sys/external/bsd/acpica/dist/compiler/asloptions.c@1.3 type: modified - new: '1.16' old: '1.15' path: src/sys/external/bsd/acpica/dist/compiler/aslutils.c pathrev: src/sys/external/bsd/acpica/dist/compiler/aslutils.c@1.16 type: modified - new: '1.9' old: '1.8' path: src/sys/external/bsd/acpica/dist/compiler/aslxref.c pathrev: src/sys/external/bsd/acpica/dist/compiler/aslxref.c@1.9 type: modified - new: '1.9' old: '1.8' path: src/sys/external/bsd/acpica/dist/compiler/dtparser.y pathrev: src/sys/external/bsd/acpica/dist/compiler/dtparser.y@1.9 type: modified - new: '1.9' old: '1.8' path: src/sys/external/bsd/acpica/dist/compiler/dttable.c pathrev: src/sys/external/bsd/acpica/dist/compiler/dttable.c@1.9 type: modified - new: '1.9' old: '1.8' path: src/sys/external/bsd/acpica/dist/compiler/prparser.y pathrev: src/sys/external/bsd/acpica/dist/compiler/prparser.y@1.9 type: modified - new: '1.11' old: '1.10' path: src/sys/external/bsd/acpica/dist/debugger/dbcmds.c pathrev: src/sys/external/bsd/acpica/dist/debugger/dbcmds.c@1.11 type: modified - new: '1.11' old: '1.10' path: src/sys/external/bsd/acpica/dist/debugger/dbutils.c pathrev: src/sys/external/bsd/acpica/dist/debugger/dbutils.c@1.11 type: modified - new: '1.12' old: '1.11' path: src/sys/external/bsd/acpica/dist/debugger/dbdisply.c pathrev: src/sys/external/bsd/acpica/dist/debugger/dbdisply.c@1.12 type: modified - new: '1.12' old: '1.11' path: src/sys/external/bsd/acpica/dist/debugger/dbexec.c pathrev: src/sys/external/bsd/acpica/dist/debugger/dbexec.c@1.12 type: modified - new: '1.13' old: '1.12' path: src/sys/external/bsd/acpica/dist/debugger/dbinput.c pathrev: src/sys/external/bsd/acpica/dist/debugger/dbinput.c@1.13 type: modified - new: '1.8' old: '1.7' path: src/sys/external/bsd/acpica/dist/debugger/dbmethod.c pathrev: src/sys/external/bsd/acpica/dist/debugger/dbmethod.c@1.8 type: modified - new: '1.8' old: '1.7' path: src/sys/external/bsd/acpica/dist/debugger/dbnames.c pathrev: src/sys/external/bsd/acpica/dist/debugger/dbnames.c@1.8 type: modified - new: '1.6' old: '1.5' path: src/sys/external/bsd/acpica/dist/debugger/dbtest.c pathrev: src/sys/external/bsd/acpica/dist/debugger/dbtest.c@1.6 type: modified - new: '1.7' old: '1.6' path: src/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c pathrev: src/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c@1.7 type: modified - new: '1.7' old: '1.6' path: src/sys/external/bsd/acpica/dist/disassembler/dmcstyle.c pathrev: src/sys/external/bsd/acpica/dist/disassembler/dmcstyle.c@1.7 type: modified - new: '1.7' old: '1.6' path: src/sys/external/bsd/acpica/dist/disassembler/dmwalk.c pathrev: src/sys/external/bsd/acpica/dist/disassembler/dmwalk.c@1.7 type: modified - new: '1.8' old: '1.7' path: src/sys/external/bsd/acpica/dist/disassembler/dmresrc.c pathrev: src/sys/external/bsd/acpica/dist/disassembler/dmresrc.c@1.8 type: modified - new: '1.8' old: '1.7' path: src/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c pathrev: src/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c@1.8 type: modified - new: '1.9' old: '1.8' path: src/sys/external/bsd/acpica/dist/disassembler/dmresrcl.c pathrev: src/sys/external/bsd/acpica/dist/disassembler/dmresrcl.c@1.9 type: modified - new: '1.7' old: '1.6' path: src/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c pathrev: src/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c@1.7 type: modified - new: '1.7' old: '1.6' path: src/sys/external/bsd/acpica/dist/dispatcher/dsutils.c pathrev: src/sys/external/bsd/acpica/dist/dispatcher/dsutils.c@1.7 type: modified - new: '1.8' old: '1.7' path: src/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c pathrev: src/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c@1.8 type: modified - new: '1.4' old: '1.3' path: src/sys/external/bsd/acpica/dist/events/evregion.c pathrev: src/sys/external/bsd/acpica/dist/events/evregion.c@1.4 type: modified - new: '1.11' old: '1.10' path: src/sys/external/bsd/acpica/dist/events/evrgnini.c pathrev: src/sys/external/bsd/acpica/dist/events/evrgnini.c@1.11 type: modified - new: '1.9' old: '1.8' path: src/sys/external/bsd/acpica/dist/events/evxface.c pathrev: src/sys/external/bsd/acpica/dist/events/evxface.c@1.9 type: modified - new: '1.11' old: '1.10' path: src/sys/external/bsd/acpica/dist/executer/exconfig.c pathrev: src/sys/external/bsd/acpica/dist/executer/exconfig.c@1.11 type: modified - new: '1.9' old: '1.8' path: src/sys/external/bsd/acpica/dist/executer/exdebug.c pathrev: src/sys/external/bsd/acpica/dist/executer/exdebug.c@1.9 type: modified - new: '1.10' old: '1.9' path: src/sys/external/bsd/acpica/dist/executer/exdump.c pathrev: src/sys/external/bsd/acpica/dist/executer/exdump.c@1.10 type: modified - new: '1.6' old: '1.5' path: src/sys/external/bsd/acpica/dist/hardware/hwesleep.c pathrev: src/sys/external/bsd/acpica/dist/hardware/hwesleep.c@1.6 type: modified - new: '1.6' old: '1.5' path: src/sys/external/bsd/acpica/dist/hardware/hwsleep.c pathrev: src/sys/external/bsd/acpica/dist/hardware/hwsleep.c@1.6 type: modified - new: '1.4' old: '1.3' path: src/sys/external/bsd/acpica/dist/hardware/hwregs.c pathrev: src/sys/external/bsd/acpica/dist/hardware/hwregs.c@1.4 type: modified - new: '1.8' old: '1.7' path: src/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c pathrev: src/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c@1.8 type: modified - new: '1.10' old: '1.9' path: src/sys/external/bsd/acpica/dist/include/acapps.h pathrev: src/sys/external/bsd/acpica/dist/include/acapps.h@1.10 type: modified - new: '1.10' old: '1.9' path: src/sys/external/bsd/acpica/dist/include/actables.h pathrev: src/sys/external/bsd/acpica/dist/include/actables.h@1.10 type: modified - new: '1.10' old: '1.9' path: src/sys/external/bsd/acpica/dist/include/actbl1.h pathrev: src/sys/external/bsd/acpica/dist/include/actbl1.h@1.10 type: modified - new: '1.12' old: '1.11' path: src/sys/external/bsd/acpica/dist/include/acdebug.h pathrev: src/sys/external/bsd/acpica/dist/include/acdebug.h@1.12 type: modified - new: '1.12' old: '1.11' path: src/sys/external/bsd/acpica/dist/include/acdisasm.h pathrev: src/sys/external/bsd/acpica/dist/include/acdisasm.h@1.12 type: modified - new: '1.12' old: '1.11' path: src/sys/external/bsd/acpica/dist/include/aclocal.h pathrev: src/sys/external/bsd/acpica/dist/include/aclocal.h@1.12 type: modified - new: '1.12' old: '1.11' path: src/sys/external/bsd/acpica/dist/include/acmacros.h pathrev: src/sys/external/bsd/acpica/dist/include/acmacros.h@1.12 type: modified - new: '1.12' old: '1.11' path: src/sys/external/bsd/acpica/dist/include/actypes.h pathrev: src/sys/external/bsd/acpica/dist/include/actypes.h@1.12 type: modified - new: '1.6' old: '1.5' path: src/sys/external/bsd/acpica/dist/include/acexcep.h pathrev: src/sys/external/bsd/acpica/dist/include/acexcep.h@1.6 type: modified - new: '1.14' old: '1.13' path: src/sys/external/bsd/acpica/dist/include/acglobal.h pathrev: src/sys/external/bsd/acpica/dist/include/acglobal.h@1.14 type: modified - new: '1.14' old: '1.13' path: src/sys/external/bsd/acpica/dist/include/acpixf.h pathrev: src/sys/external/bsd/acpica/dist/include/acpixf.h@1.14 type: modified - new: '1.14' old: '1.13' path: src/sys/external/bsd/acpica/dist/include/acutils.h pathrev: src/sys/external/bsd/acpica/dist/include/acutils.h@1.14 type: modified - new: '1.9' old: '1.8' path: src/sys/external/bsd/acpica/dist/include/acinterp.h pathrev: src/sys/external/bsd/acpica/dist/include/acinterp.h@1.9 type: modified - new: '1.9' old: '1.8' path: src/sys/external/bsd/acpica/dist/include/acresrc.h pathrev: src/sys/external/bsd/acpica/dist/include/acresrc.h@1.9 type: modified - new: '1.11' old: '1.10' path: src/sys/external/bsd/acpica/dist/include/acnamesp.h pathrev: src/sys/external/bsd/acpica/dist/include/acnamesp.h@1.11 type: modified - new: '1.11' old: '1.10' path: src/sys/external/bsd/acpica/dist/include/acpiosxf.h pathrev: src/sys/external/bsd/acpica/dist/include/acpiosxf.h@1.11 type: modified - new: '1.7' old: '1.6' path: src/sys/external/bsd/acpica/dist/include/acoutput.h pathrev: src/sys/external/bsd/acpica/dist/include/acoutput.h@1.7 type: modified - new: '1.4' old: '1.3' path: src/sys/external/bsd/acpica/dist/include/platform/acgcc.h pathrev: src/sys/external/bsd/acpica/dist/include/platform/acgcc.h@1.4 type: modified - new: '1.15' old: '1.14' path: src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h pathrev: src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h@1.15 type: modified - new: '1.10' old: '1.9' path: src/sys/external/bsd/acpica/dist/namespace/nsaccess.c pathrev: src/sys/external/bsd/acpica/dist/namespace/nsaccess.c@1.10 type: modified - new: '1.10' old: '1.9' path: src/sys/external/bsd/acpica/dist/namespace/nseval.c pathrev: src/sys/external/bsd/acpica/dist/namespace/nseval.c@1.10 type: modified - new: '1.10' old: '1.9' path: src/sys/external/bsd/acpica/dist/namespace/nsrepair2.c pathrev: src/sys/external/bsd/acpica/dist/namespace/nsrepair2.c@1.10 type: modified - new: '1.10' old: '1.9' path: src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c pathrev: src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c@1.10 type: modified - new: '1.11' old: '1.10' path: src/sys/external/bsd/acpica/dist/namespace/nsdump.c pathrev: src/sys/external/bsd/acpica/dist/namespace/nsdump.c@1.11 type: modified - new: '1.12' old: '1.11' path: src/sys/external/bsd/acpica/dist/namespace/nsinit.c pathrev: src/sys/external/bsd/acpica/dist/namespace/nsinit.c@1.12 type: modified - new: '1.9' old: '1.8' path: src/sys/external/bsd/acpica/dist/namespace/nsxfname.c pathrev: src/sys/external/bsd/acpica/dist/namespace/nsxfname.c@1.9 type: modified - new: '1.7' old: '1.6' path: src/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c pathrev: src/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c@1.7 type: modified - new: '1.8' old: '1.7' path: src/sys/external/bsd/acpica/dist/parser/psopcode.c pathrev: src/sys/external/bsd/acpica/dist/parser/psopcode.c@1.8 type: modified - new: '1.9' old: '1.8' path: src/sys/external/bsd/acpica/dist/parser/psopinfo.c pathrev: src/sys/external/bsd/acpica/dist/parser/psopinfo.c@1.9 type: modified - new: '1.9' old: '1.8' path: src/sys/external/bsd/acpica/dist/resources/rsdump.c pathrev: src/sys/external/bsd/acpica/dist/resources/rsdump.c@1.9 type: modified - new: '1.9' old: '1.8' path: src/sys/external/bsd/acpica/dist/resources/rsxface.c pathrev: src/sys/external/bsd/acpica/dist/resources/rsxface.c@1.9 type: modified - new: '1.7' old: '1.6' path: src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c pathrev: src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c@1.7 type: modified - new: '1.10' old: '1.9' path: src/sys/external/bsd/acpica/dist/resources/rsutils.c pathrev: src/sys/external/bsd/acpica/dist/resources/rsutils.c@1.10 type: modified - new: '1.8' old: '1.7' path: src/sys/external/bsd/acpica/dist/tables/tbdata.c pathrev: src/sys/external/bsd/acpica/dist/tables/tbdata.c@1.8 type: modified - new: '1.11' old: '1.10' path: src/sys/external/bsd/acpica/dist/tables/tbfadt.c pathrev: src/sys/external/bsd/acpica/dist/tables/tbfadt.c@1.11 type: modified - new: '1.11' old: '1.10' path: src/sys/external/bsd/acpica/dist/tables/tbxface.c pathrev: src/sys/external/bsd/acpica/dist/tables/tbxface.c@1.11 type: modified - new: '1.10' old: '1.9' path: src/sys/external/bsd/acpica/dist/tables/tbinstal.c pathrev: src/sys/external/bsd/acpica/dist/tables/tbinstal.c@1.10 type: modified - new: '1.12' old: '1.11' path: src/sys/external/bsd/acpica/dist/tables/tbutils.c pathrev: src/sys/external/bsd/acpica/dist/tables/tbutils.c@1.12 type: modified - new: '1.5' old: '1.4' path: src/sys/external/bsd/acpica/dist/tables/tbxfload.c pathrev: src/sys/external/bsd/acpica/dist/tables/tbxfload.c@1.5 type: modified - new: '1.9' old: '1.8' path: src/sys/external/bsd/acpica/dist/tables/tbxfroot.c pathrev: src/sys/external/bsd/acpica/dist/tables/tbxfroot.c@1.9 type: modified - new: '1.8' old: '1.7' path: src/sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c pathrev: src/sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c@1.8 type: modified - new: '1.8' old: '1.7' path: src/sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c pathrev: src/sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c@1.8 type: modified - new: '1.10' old: '1.9' path: src/sys/external/bsd/acpica/dist/utilities/utcache.c pathrev: src/sys/external/bsd/acpica/dist/utilities/utcache.c@1.10 type: modified - new: '1.10' old: '1.9' path: src/sys/external/bsd/acpica/dist/utilities/utmisc.c pathrev: src/sys/external/bsd/acpica/dist/utilities/utmisc.c@1.10 type: modified - new: '1.13' old: '1.12' path: src/sys/external/bsd/acpica/dist/utilities/utdebug.c pathrev: src/sys/external/bsd/acpica/dist/utilities/utdebug.c@1.13 type: modified - new: '1.11' old: '1.10' path: src/sys/external/bsd/acpica/dist/utilities/utdecode.c pathrev: src/sys/external/bsd/acpica/dist/utilities/utdecode.c@1.11 type: modified - new: '1.9' old: '1.8' path: src/sys/external/bsd/acpica/dist/utilities/uteval.c pathrev: src/sys/external/bsd/acpica/dist/utilities/uteval.c@1.9 type: modified - new: '1.9' old: '1.8' path: src/sys/external/bsd/acpica/dist/utilities/utglobal.c pathrev: src/sys/external/bsd/acpica/dist/utilities/utglobal.c@1.9 type: modified - new: '1.9' old: '1.8' path: src/sys/external/bsd/acpica/dist/utilities/utosi.c pathrev: src/sys/external/bsd/acpica/dist/utilities/utosi.c@1.9 type: modified - new: '1.7' old: '1.6' path: src/sys/external/bsd/acpica/dist/utilities/utmutex.c pathrev: src/sys/external/bsd/acpica/dist/utilities/utmutex.c@1.7 type: modified - new: '1.3' old: '1.2' path: src/sys/external/bsd/acpica/dist/utilities/utobject.c pathrev: src/sys/external/bsd/acpica/dist/utilities/utobject.c@1.3 type: modified - new: '1.3' old: '1.2' path: src/sys/external/bsd/acpica/dist/utilities/utprint.c pathrev: src/sys/external/bsd/acpica/dist/utilities/utprint.c@1.3 type: modified - new: '1.12' old: '1.11' path: src/sys/external/bsd/acpica/dist/utilities/uttrack.c pathrev: src/sys/external/bsd/acpica/dist/utilities/uttrack.c@1.12 type: modified - new: '1.5' old: '1.4' path: src/sys/external/bsd/acpica/dist/utilities/utuuid.c pathrev: src/sys/external/bsd/acpica/dist/utilities/utuuid.c@1.5 type: modified id: 20170125T133823Z.9b94330f43f42fddc4fa38b6559050125b8aee7d log: "merge conflicts\n" module: src subject: 'CVS commit: src/sys/external/bsd/acpica/dist' unixtime: '1485351503' user: christos