From owner-cvs-all@FreeBSD.ORG  Tue Apr 29 12:11:01 2003
Return-Path: <owner-cvs-all@FreeBSD.ORG>
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 77D3B37B401; Tue, 29 Apr 2003 12:11:01 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 17F5843FDF; Tue, 29 Apr 2003 12:11:01 -0700 (PDT)
	(envelope-from njl@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 h3TJB00U076854;
	Tue, 29 Apr 2003 12:11:00 -0700 (PDT)
	(envelope-from njl@repoman.freebsd.org)
Received: (from njl@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3TJB0E2076851;
	Tue, 29 Apr 2003 12:11:00 -0700 (PDT)
Message-Id: <200304291911.h3TJB0E2076851@repoman.freebsd.org>
From: Nate Lawson <njl@FreeBSD.org>
Date: Tue, 29 Apr 2003 12:11:00 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/contrib/dev/acpica acconfig.h acenv.h
 acfreebsd.h acgcc.h acpi.h acpiosxf.h acpixf.h acutils.h dbcmds.c
 dbxface.c exfldio.c exsystem.c hwsleep.c psparse.c rscreate.c
 tbget.c utglobal.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Apr 2003 19:11:02 -0000

njl         2003/04/29 12:11:00 PDT

  FreeBSD src repository

  Modified files:
    sys/contrib/dev/acpica acconfig.h acenv.h acfreebsd.h acgcc.h 
                           acpi.h acpiosxf.h acpixf.h acutils.h 
                           dbcmds.c dbxface.c exfldio.c exsystem.c 
                           hwsleep.c psparse.c rscreate.c tbget.c 
                           utglobal.c 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.24      +35 -34    src/sys/contrib/dev/acpica/acconfig.h
  1.5       +5 -7      src/sys/contrib/dev/acpica/acenv.h
  1.14      +7 -3      src/sys/contrib/dev/acpica/acfreebsd.h
  1.19      +9 -2      src/sys/contrib/dev/acpica/acgcc.h
  1.4       +2 -2      src/sys/contrib/dev/acpica/acpi.h
  1.13      +43 -6     src/sys/contrib/dev/acpica/acpiosxf.h
  1.18      +24 -3     src/sys/contrib/dev/acpica/acpixf.h
  1.7       +61 -50    src/sys/contrib/dev/acpica/acutils.h
  1.6       +67 -37    src/sys/contrib/dev/acpica/dbcmds.c
  1.5       +122 -66   src/sys/contrib/dev/acpica/dbxface.c
  1.15      +3 -3      src/sys/contrib/dev/acpica/exfldio.c
  1.7       +2 -2      src/sys/contrib/dev/acpica/exsystem.c
  1.9       +57 -21    src/sys/contrib/dev/acpica/hwsleep.c
  1.20      +18 -43    src/sys/contrib/dev/acpica/psparse.c
  1.8       +16 -16    src/sys/contrib/dev/acpica/rscreate.c
  1.11      +5 -5      src/sys/contrib/dev/acpica/tbget.c
  1.9       +39 -30    src/sys/contrib/dev/acpica/utglobal.c