From owner-cvs-all@FreeBSD.ORG  Tue Apr 29 11:46:32 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 763F637B405; Tue, 29 Apr 2003 11:46:32 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 1560843FBF; Tue, 29 Apr 2003 11:46:32 -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 h3TIkV0U059429;
	Tue, 29 Apr 2003 11:46:31 -0700 (PDT)
	(envelope-from njl@repoman.freebsd.org)
Received: (from njl@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3TIkVvK059426;
	Tue, 29 Apr 2003 11:46:31 -0700 (PDT)
Message-Id: <200304291846.h3TIkVvK059426@repoman.freebsd.org>
From: Nate Lawson <njl@FreeBSD.org>
Date: Tue, 29 Apr 2003 11:46:31 -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 dbfileio.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 18:46:32 -0000

njl         2003/04/29 11:46:31 PDT

  FreeBSD src repository

  Modified files:
    sys/contrib/dev/acpica dbfileio.c 
  Log:
  Resolve conflicts
  
  Revision  Changes    Path
  1.8       +46 -85    src/sys/contrib/dev/acpica/dbfileio.c