Date: Wed, 20 Dec 2000 23:04:32 -0800 (PST) From: Mike Smith <msmith@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/contrib/dev/acpica/Subsystem/Hardware hwxface.c src/sys/contrib/dev/acpica/Subsystem/Include acconfig.h acfreebsd.h acgcc.h acpixf.h src/sys/contrib/dev/acpica/Subsystem/Parser psparse.c Message-ID: <200012210704.eBL74XK79461@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
msmith 2000/12/20 23:04:32 PST
Modified files:
sys/contrib/dev/acpica/Subsystem/Hardware hwxface.c
sys/contrib/dev/acpica/Subsystem/Include acconfig.h
acfreebsd.h acgcc.h
acpixf.h
sys/contrib/dev/acpica/Subsystem/Parser psparse.c
Log:
Resolve conflicts from the ACPI CA 20001215 vendor import.
Revision Changes Path
1.5 +3 -3 src/sys/contrib/dev/acpica/Subsystem/Hardware/hwxface.c
1.5 +3 -3 src/sys/contrib/dev/acpica/Subsystem/Include/acconfig.h
1.4 +3 -3 src/sys/contrib/dev/acpica/Subsystem/Include/acfreebsd.h
1.4 +3 -3 src/sys/contrib/dev/acpica/Subsystem/Include/acgcc.h
1.4 +3 -3 src/sys/contrib/dev/acpica/Subsystem/Include/acpixf.h
1.5 +17 -20 src/sys/contrib/dev/acpica/Subsystem/Parser/psparse.c
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200012210704.eBL74XK79461>
