From owner-cvs-src@FreeBSD.ORG  Mon Oct 11 00:58:25 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 6858116A4CF; Mon, 11 Oct 2004 00:58:25 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 364C743D4C; Mon, 11 Oct 2004 00:58:25 +0000 (GMT)
	(envelope-from imp@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9B0wPpX019950;
	Mon, 11 Oct 2004 00:58:25 GMT
	(envelope-from imp@repoman.freebsd.org)
Received: (from imp@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9B0wPdf019949;
	Mon, 11 Oct 2004 00:58:25 GMT
	(envelope-from imp)
Message-Id: <200410110058.i9B0wPdf019949@repoman.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 11 Oct 2004 00:58:24 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/i386/isa pbio.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
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: Mon, 11 Oct 2004 00:58:25 -0000

imp         2004-10-11 00:58:24 UTC

  FreeBSD src repository

  Modified files:
    sys/i386/isa         pbio.c 
  Log:
  Fix conflicts I didn't fix before I committed my busspace changes.
  
  Noticed by: ru@ (and likely tinderbox, I haven't checked)
  
  Revision  Changes    Path
  1.5       +2 -4      src/sys/i386/isa/pbio.c