From owner-cvs-src@FreeBSD.ORG  Thu Mar 22 17:58:29 2007
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8A7D816A402;
	Thu, 22 Mar 2007 17:58:29 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 6CA9613C4B0;
	Thu, 22 Mar 2007 17:58:29 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2MHwTTQ039730;
	Thu, 22 Mar 2007 17:58:29 GMT
	(envelope-from jkim@repoman.freebsd.org)
Received: (from jkim@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2MHwSN3039725;
	Thu, 22 Mar 2007 17:58:28 GMT (envelope-from jkim)
Message-Id: <200703221758.l2MHwSN3039725@repoman.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 22 Mar 2007 17:58:28 +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 acconfig.h acenv.h
 acfreebsd.h acgcc.h acpi.h acpiosxf.h acpixf.h acutils.h
 aecommon.h dbfileio.c dmopcode.c exfldio.c exsystem.c hwregs.c
 osunixxf.c psparse.c rscreate.c rsdump.c utdebug.c uteval.c ...
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Mar 2007 17:58:29 -0000

jkim        2007-03-22 17:58:28 UTC

  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 
                           aecommon.h dbfileio.c dmopcode.c 
                           exfldio.c exsystem.c hwregs.c 
                           osunixxf.c psparse.c rscreate.c 
                           rsdump.c utdebug.c uteval.c utglobal.c 
  Log:
  Resolve conflicts of unchanged files that are off the vendor branch.
  
  Revision  Changes    Path
  1.34      +34 -26    src/sys/contrib/dev/acpica/acconfig.h
  1.13      +29 -29    src/sys/contrib/dev/acpica/acenv.h
  1.32      +31 -2     src/sys/contrib/dev/acpica/acfreebsd.h
  1.22      +8 -5      src/sys/contrib/dev/acpica/acgcc.h
  1.9       +2 -2      src/sys/contrib/dev/acpica/acpi.h
  1.19      +80 -40    src/sys/contrib/dev/acpica/acpiosxf.h
  1.25      +32 -29    src/sys/contrib/dev/acpica/acpixf.h
  1.15      +155 -48   src/sys/contrib/dev/acpica/acutils.h
  1.3       +10 -3     src/sys/contrib/dev/acpica/aecommon.h
  1.14      +113 -59   src/sys/contrib/dev/acpica/dbfileio.c
  1.5       +61 -38    src/sys/contrib/dev/acpica/dmopcode.c
  1.26      +126 -70   src/sys/contrib/dev/acpica/exfldio.c
  1.14      +71 -116   src/sys/contrib/dev/acpica/exsystem.c
  1.7       +182 -172  src/sys/contrib/dev/acpica/hwregs.c
  1.3       +74 -31    src/sys/contrib/dev/acpica/osunixxf.c
  1.28      +42 -30    src/sys/contrib/dev/acpica/psparse.c
  1.13      +68 -61    src/sys/contrib/dev/acpica/rscreate.c
  1.3       +52 -50    src/sys/contrib/dev/acpica/rsdump.c
  1.3       +56 -17    src/sys/contrib/dev/acpica/utdebug.c
  1.7       +109 -48   src/sys/contrib/dev/acpica/uteval.c
  1.20      +75 -180   src/sys/contrib/dev/acpica/utglobal.c