From owner-cvs-all@FreeBSD.ORG  Tue Nov  1 22:28:49 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 D007F16A41F;
	Tue,  1 Nov 2005 22:28:49 +0000 (GMT)
	(envelope-from jkim@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9C11143D48;
	Tue,  1 Nov 2005 22:28:49 +0000 (GMT)
	(envelope-from jkim@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 jA1MSndE098661;
	Tue, 1 Nov 2005 22:28:49 GMT (envelope-from jkim@repoman.freebsd.org)
Received: (from jkim@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA1MSnNL098660;
	Tue, 1 Nov 2005 22:28:49 GMT (envelope-from jkim)
Message-Id: <200511012228.jA1MSnNL098660@repoman.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Tue, 1 Nov 2005 22:28:49 +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 dbcmds.c dbfileio.c
 dbxface.c dmopcode.c hwregs.c hwsleep.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: Tue, 01 Nov 2005 22:28:50 -0000

jkim        2005-11-01 22:28:49 UTC

  FreeBSD src repository

  Modified files:
    sys/contrib/dev/acpica dbcmds.c dbfileio.c dbxface.c 
                           dmopcode.c hwregs.c hwsleep.c uteval.c 
                           utglobal.c 
  Log:
  Fix conflicts from import of Intel ACPI-CA 20051021
  
  Revision  Changes    Path
  1.16      +558 -147  src/sys/contrib/dev/acpica/dbcmds.c
  1.13      +57 -24    src/sys/contrib/dev/acpica/dbfileio.c
  1.9       +66 -42    src/sys/contrib/dev/acpica/dbxface.c
  1.4       +15 -7     src/sys/contrib/dev/acpica/dmopcode.c
  1.6       +70 -48    src/sys/contrib/dev/acpica/hwregs.c
  1.20      +62 -54    src/sys/contrib/dev/acpica/hwsleep.c
  1.6       +40 -15    src/sys/contrib/dev/acpica/uteval.c
  1.19      +100 -160  src/sys/contrib/dev/acpica/utglobal.c