From owner-cvs-all  Tue Jul  9 10:54:10 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 737EF37B400; Tue,  9 Jul 2002 10:54:03 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 12FA843E31; Tue,  9 Jul 2002 10:54:03 -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 g69Hs2JU052016;
	Tue, 9 Jul 2002 10:54:02 -0700 (PDT)
	(envelope-from iwasaki@freefall.freebsd.org)
Received: (from iwasaki@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g69Hs2Xb052015;
	Tue, 9 Jul 2002 10:54:02 -0700 (PDT)
Message-Id: <200207091754.g69Hs2Xb052015@freefall.freebsd.org>
From: Mitsuru IWASAKI <iwasaki@FreeBSD.org>
Date: Tue, 9 Jul 2002 10:54:02 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/sys/boot/i386/libi386 biosacpi.c src/sys/conf
         files src/sys/contrib/dev/acpica acconfig.h acenv.h acfreebsd.h
         acgcc.h acpixf.h acutils.h dbdisasm.c dbfileio.c exfldio.c
         exsystem.c hwsleep.c psparse.c rscreate.c tbget.c utglobal.c ...
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/07/09 10:54:02 PDT

  Modified files:
    sys/boot/i386/libi386 biosacpi.c 
    sys/conf             files 
    sys/contrib/dev/acpica acconfig.h acenv.h acfreebsd.h acgcc.h 
                           acpixf.h acutils.h dbdisasm.c 
                           dbfileio.c exfldio.c exsystem.c 
                           hwsleep.c psparse.c rscreate.c tbget.c 
                           utglobal.c 
    sys/dev/acpica       acpi.c acpica_support.c 
    sys/modules/acpi     Makefile 
    usr.sbin/acpi/acpiconf acpiconf.c 
  Added files:
    sys/dev/acpica/Osd   OsdTable.c 
  Log:
  Resolve conflicts arising from the ACPI CA 20020611 import.
  
  Revision  Changes    Path
  1.3       +1 -2      src/sys/boot/i386/libi386/biosacpi.c
  1.659     +1 -0      src/sys/conf/files
  1.19      +37 -56    src/sys/contrib/dev/acpica/acconfig.h
  1.2       +124 -67   src/sys/contrib/dev/acpica/acenv.h
  1.10      +164 -8    src/sys/contrib/dev/acpica/acfreebsd.h
  1.17      +0 -162    src/sys/contrib/dev/acpica/acgcc.h
  1.15      +33 -3     src/sys/contrib/dev/acpica/acpixf.h
  1.2       +395 -264  src/sys/contrib/dev/acpica/acutils.h
  1.3       +60 -57    src/sys/contrib/dev/acpica/dbdisasm.c
  1.4       +4 -7      src/sys/contrib/dev/acpica/dbfileio.c
  1.12      +27 -19    src/sys/contrib/dev/acpica/exfldio.c
  1.4       +3 -5      src/sys/contrib/dev/acpica/exsystem.c
  1.6       +106 -36   src/sys/contrib/dev/acpica/hwsleep.c
  1.16      +136 -124  src/sys/contrib/dev/acpica/psparse.c
  1.4       +20 -20    src/sys/contrib/dev/acpica/rscreate.c
  1.6       +167 -49   src/sys/contrib/dev/acpica/tbget.c
  1.4       +47 -28    src/sys/contrib/dev/acpica/utglobal.c
  1.1       +71 -0     src/sys/dev/acpica/Osd/OsdTable.c (new)
  1.65      +7 -19     src/sys/dev/acpica/acpi.c
  1.6       +4 -41     src/sys/dev/acpica/acpica_support.c
  1.20      +1 -1      src/sys/modules/acpi/Makefile
  1.8       +1 -1      src/usr.sbin/acpi/acpiconf/acpiconf.c

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