Module Name: src Committed By: christos Date: Thu Oct 28 14:53:09 UTC 2021
Modified Files: src/sys/external/bsd/acpica/dist/compiler: aslutils.c dtfield.c dtutils.c src/sys/external/bsd/acpica/dist/hardware: hwesleep.c hwsleep.c hwxfsleep.c src/sys/external/bsd/acpica/dist/include: acdisasm.h acglobal.h acoutput.h acpixf.h actbl1.h actypes.h src/sys/external/bsd/acpica/dist/utilities: utosi.c Log Message: merge conflicts between 2021-06-04 and 2021-09-30 To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 \ src/sys/external/bsd/acpica/dist/compiler/aslutils.c cvs rdiff -u -r1.18 -r1.19 \ src/sys/external/bsd/acpica/dist/compiler/dtfield.c cvs rdiff -u -r1.17 -r1.18 \ src/sys/external/bsd/acpica/dist/compiler/dtutils.c cvs rdiff -u -r1.10 -r1.11 \ src/sys/external/bsd/acpica/dist/hardware/hwesleep.c cvs rdiff -u -r1.12 -r1.13 \ src/sys/external/bsd/acpica/dist/hardware/hwsleep.c cvs rdiff -u -r1.15 -r1.16 \ src/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c cvs rdiff -u -r1.22 -r1.23 \ src/sys/external/bsd/acpica/dist/include/acdisasm.h cvs rdiff -u -r1.23 -r1.24 \ src/sys/external/bsd/acpica/dist/include/acglobal.h cvs rdiff -u -r1.13 -r1.14 \ src/sys/external/bsd/acpica/dist/include/acoutput.h cvs rdiff -u -r1.30 -r1.31 src/sys/external/bsd/acpica/dist/include/acpixf.h cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/acpica/dist/include/actbl1.h cvs rdiff -u -r1.24 -r1.25 src/sys/external/bsd/acpica/dist/include/actypes.h cvs rdiff -u -r1.16 -r1.17 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.