From owner-cvs-all  Fri Dec  1  1:49:39 2000
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 53BFD37B400; Fri,  1 Dec 2000 01:49:36 -0800 (PST)
Received: (from msmith@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id eB19naR75811;
	Fri, 1 Dec 2000 01:49:36 -0800 (PST)
	(envelope-from msmith)
Message-Id: <200012010949.eB19naR75811@freefall.freebsd.org>
From: Mike Smith <msmith@FreeBSD.org>
Date: Fri, 1 Dec 2000 01:49:36 -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 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/01 01:49:36 PST

  Modified files:
    sys/contrib/dev/acpica/Subsystem/Hardware hwxface.c 
    sys/contrib/dev/acpica/Subsystem/Include acconfig.h acpixf.h 
    sys/contrib/dev/acpica/Subsystem/Parser psparse.c 
  Log:
  Resolve conflicts from the vendor update.
  
  Revision  Changes    Path
  1.3       +34 -26    src/sys/contrib/dev/acpica/Subsystem/Hardware/hwxface.c
  1.3       +4 -26     src/sys/contrib/dev/acpica/Subsystem/Include/acconfig.h
  1.3       +4 -5      src/sys/contrib/dev/acpica/Subsystem/Include/acpixf.h
  1.3       +15 -103   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