From owner-cvs-all  Wed Nov 27 10:13: 2 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 610C337B401; Wed, 27 Nov 2002 10:13:01 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id C98A443EC5; Wed, 27 Nov 2002 10:13:00 -0800 (PST)
	(envelope-from iwasaki@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gARI9LmV090442;
	Wed, 27 Nov 2002 10:09:21 -0800 (PST)
	(envelope-from iwasaki@repoman.freebsd.org)
Received: (from iwasaki@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gARI9KBu090441;
	Wed, 27 Nov 2002 10:09:20 -0800 (PST)
Message-Id: <200211271809.gARI9KBu090441@repoman.freebsd.org>
From: Mitsuru IWASAKI <iwasaki@FreeBSD.org>
Date: Wed, 27 Nov 2002 10:09:20 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/sys/contrib/dev/acpica acconfig.h acpiosxf.h
         acpixf.h acutils.h dbcmds.c dbfileio.c exfldio.c exsystem.c
         hwsleep.c psparse.c rscreate.c tbget.c utglobal.c
         src/sys/dev/acpica acpi_ec.c src/sys/dev/acpica/Osd OsdSynch.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/11/27 10:09:20 PST

  Modified files:
    sys/contrib/dev/acpica acconfig.h acpiosxf.h acpixf.h 
                           acutils.h dbcmds.c dbfileio.c exfldio.c 
                           exsystem.c hwsleep.c psparse.c 
                           rscreate.c tbget.c utglobal.c 
    sys/dev/acpica       acpi_ec.c 
    sys/dev/acpica/Osd   OsdSynch.c 
    sys/sys              ctype.h 
  Log:
  Resolve conflicts arising from the ACPI CA 20021118 import.
  
  Revision  Changes    Path
  1.23      +6 -2      src/sys/contrib/dev/acpica/acconfig.h
  1.12      +1 -1      src/sys/contrib/dev/acpica/acpiosxf.h
  1.17      +1 -1      src/sys/contrib/dev/acpica/acpixf.h
  1.6       +10 -1     src/sys/contrib/dev/acpica/acutils.h
  1.5       +3 -4      src/sys/contrib/dev/acpica/dbcmds.c
  1.7       +19 -1     src/sys/contrib/dev/acpica/dbfileio.c
  1.14      +30 -16    src/sys/contrib/dev/acpica/exfldio.c
  1.6       +5 -5      src/sys/contrib/dev/acpica/exsystem.c
  1.8       +7 -1      src/sys/contrib/dev/acpica/hwsleep.c
  1.19      +47 -48    src/sys/contrib/dev/acpica/psparse.c
  1.7       +76 -52    src/sys/contrib/dev/acpica/rscreate.c
  1.10      +1 -2      src/sys/contrib/dev/acpica/tbget.c
  1.8       +20 -36    src/sys/contrib/dev/acpica/utglobal.c
  1.16      +3 -3      src/sys/dev/acpica/Osd/OsdSynch.c
  1.29      +2 -2      src/sys/dev/acpica/acpi_ec.c
  1.3       +2 -1      src/sys/sys/ctype.h

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