From owner-cvs-all Wed Dec 20 23: 4:36 2000 From owner-cvs-all@FreeBSD.ORG Wed Dec 20 23:04:33 2000 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7F96D37B402; Wed, 20 Dec 2000 23:04:33 -0800 (PST) Received: (from msmith@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id eBL74XK79461; Wed, 20 Dec 2000 23:04:33 -0800 (PST) (envelope-from msmith) Message-Id: <200012210704.eBL74XK79461@freefall.freebsd.org> From: Mike Smith Date: Wed, 20 Dec 2000 23:04:32 -0800 (PST) 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 X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG 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