From owner-cvs-all@FreeBSD.ORG  Mon Oct 24 04:35:21 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: 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 056C116A41F;
	Mon, 24 Oct 2005 04:35:21 +0000 (GMT)
	(envelope-from obrien@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BBEDA43D48;
	Mon, 24 Oct 2005 04:35:20 +0000 (GMT)
	(envelope-from obrien@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9O4ZKWf063211;
	Mon, 24 Oct 2005 04:35:20 GMT
	(envelope-from obrien@repoman.freebsd.org)
Received: (from obrien@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9O4ZKUQ063210;
	Mon, 24 Oct 2005 04:35:20 GMT (envelope-from obrien)
Message-Id: <200510240435.j9O4ZKUQ063210@repoman.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Mon, 24 Oct 2005 04:35:20 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/contrib/dev/acpica acenv.h acfreebsd.h acpi.h
 acpiosxf.h acpixf.h dbcmds.c dbfileio.c dbxface.c dmopcode.c
 exfldio.c exsystem.c hwregs.c hwsleep.c psparse.c rscreate.c
 tbget.c uteval.c utglobal.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
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: Mon, 24 Oct 2005 04:35:21 -0000

obrien      2005-10-24 04:35:20 UTC

  FreeBSD src repository

  Modified files:
    sys/contrib/dev/acpica acenv.h acfreebsd.h acpi.h acpiosxf.h 
                           acpixf.h dbcmds.c dbfileio.c dbxface.c 
                           dmopcode.c exfldio.c exsystem.c 
                           hwregs.c hwsleep.c psparse.c rscreate.c 
                           tbget.c uteval.c utglobal.c 
  Log:
  Fix conflicts of import of Intel ACPI-CA 20041119 with system includes fixups.
  
  Revision  Changes    Path
  1.11      +1 -1      src/sys/contrib/dev/acpica/acenv.h
  1.29      +1 -1      src/sys/contrib/dev/acpica/acfreebsd.h
  1.7       +15 -15    src/sys/contrib/dev/acpica/acpi.h
  1.17      +2 -2      src/sys/contrib/dev/acpica/acpiosxf.h
  1.23      +2 -2      src/sys/contrib/dev/acpica/acpixf.h
  1.15      +9 -9      src/sys/contrib/dev/acpica/dbcmds.c
  1.12      +4 -4      src/sys/contrib/dev/acpica/dbfileio.c
  1.8       +4 -4      src/sys/contrib/dev/acpica/dbxface.c
  1.3       +4 -4      src/sys/contrib/dev/acpica/dmopcode.c
  1.24      +5 -5      src/sys/contrib/dev/acpica/exfldio.c
  1.12      +3 -3      src/sys/contrib/dev/acpica/exsystem.c
  1.5       +3 -3      src/sys/contrib/dev/acpica/hwregs.c
  1.19      +1 -1      src/sys/contrib/dev/acpica/hwsleep.c
  1.26      +6 -6      src/sys/contrib/dev/acpica/psparse.c
  1.11      +4 -4      src/sys/contrib/dev/acpica/rscreate.c
  1.16      +2 -2      src/sys/contrib/dev/acpica/tbget.c
  1.5       +3 -3      src/sys/contrib/dev/acpica/uteval.c
  1.18      +2 -2      src/sys/contrib/dev/acpica/utglobal.c