From owner-cvs-all  Sun Jun 30 10:53:19 2002
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id D03DA37B400; Sun, 30 Jun 2002 10:53:12 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 8BA5B43E13; Sun, 30 Jun 2002 10:53:12 -0700 (PDT)
	(envelope-from iwasaki@FreeBSD.org)
Received: from freefall.freebsd.org (iwasaki@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5UHrCJU001942;
	Sun, 30 Jun 2002 10:53:12 -0700 (PDT)
	(envelope-from iwasaki@freefall.freebsd.org)
Received: (from iwasaki@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5UHrCIZ001941;
	Sun, 30 Jun 2002 10:53:12 -0700 (PDT)
Message-Id: <200206301753.g5UHrCIZ001941@freefall.freebsd.org>
From: Mitsuru IWASAKI <iwasaki@FreeBSD.org>
Date: Sun, 30 Jun 2002 10:53:12 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/sys/contrib/dev/acpica acconfig.h acfreebsd.h
         acgcc.h acpiosxf.h acpixf.h dbfileio.c exfldio.c hwsleep.c
         psparse.c tbget.c utglobal.c src/sys/dev/acpica acpica_support.c
         src/sys/i386/acpica OsdEnvironment.c src/sys/ia64/acpica ...
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

iwasaki     2002/06/30 10:53:12 PDT

  Modified files:
    sys/contrib/dev/acpica acconfig.h acfreebsd.h acgcc.h 
                           acpiosxf.h acpixf.h dbfileio.c 
                           exfldio.c hwsleep.c psparse.c tbget.c 
                           utglobal.c 
    sys/dev/acpica       acpica_support.c 
    sys/i386/acpica      OsdEnvironment.c 
    sys/ia64/acpica      OsdEnvironment.c 
  Log:
  Resolve conflicts arising from the ACPI CA 20020404 import.
  
  Revision  Changes    Path
  1.18      +1 -1      src/sys/contrib/dev/acpica/acconfig.h
  1.9       +6 -0      src/sys/contrib/dev/acpica/acfreebsd.h
  1.16      +8 -9      src/sys/contrib/dev/acpica/acgcc.h
  1.9       +11 -1     src/sys/contrib/dev/acpica/acpiosxf.h
  1.14      +1 -1      src/sys/contrib/dev/acpica/acpixf.h
  1.3       +34 -17    src/sys/contrib/dev/acpica/dbfileio.c
  1.11      +5 -5      src/sys/contrib/dev/acpica/exfldio.c
  1.5       +1 -0      src/sys/contrib/dev/acpica/hwsleep.c
  1.15      +75 -29    src/sys/contrib/dev/acpica/psparse.c
  1.5       +132 -167  src/sys/contrib/dev/acpica/tbget.c
  1.3       +35 -21    src/sys/contrib/dev/acpica/utglobal.c
  1.5       +3 -5      src/sys/dev/acpica/acpica_support.c
  1.4       +2 -2      src/sys/i386/acpica/OsdEnvironment.c
  1.3       +10 -5     src/sys/ia64/acpica/OsdEnvironment.c

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message