From owner-cvs-all  Wed Jan 31  1:45: 8 2001
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 287A937B4EC; Wed, 31 Jan 2001 01:44:48 -0800 (PST)
Received: (from msmith@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f0V9imi46591;
	Wed, 31 Jan 2001 01:44:48 -0800 (PST)
	(envelope-from msmith)
Message-Id: <200101310944.f0V9imi46591@freefall.freebsd.org>
From: Mike Smith <msmith@FreeBSD.org>
Date: Wed, 31 Jan 2001 01:44:47 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: 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      2001/01/31 01:44:47 PST

  Modified files:
    sys/contrib/dev/acpica/Subsystem/Include acconfig.h 
                                             acfreebsd.h acgcc.h 
                                             acpixf.h 
    sys/contrib/dev/acpica/Subsystem/Parser psparse.c 
  Log:
  Merge conflicts from the ACPI CA 20010125 import.
  
  Revision  Changes    Path
  1.6       +7 -3      src/sys/contrib/dev/acpica/Subsystem/Include/acconfig.h
  1.6       +2 -2      src/sys/contrib/dev/acpica/Subsystem/Include/acfreebsd.h
  1.5       +2 -2      src/sys/contrib/dev/acpica/Subsystem/Include/acgcc.h
  1.5       +3 -4      src/sys/contrib/dev/acpica/Subsystem/Include/acpixf.h
  1.6       +14 -5     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