From owner-cvs-src@FreeBSD.ORG  Fri May 11 13:48:17 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 CBBE016A409;
	Fri, 11 May 2007 13:48:17 +0000 (UTC)
	(envelope-from mjacob@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 99C5C13C4AD;
	Fri, 11 May 2007 13:48:17 +0000 (UTC)
	(envelope-from mjacob@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 l4BDmHCR041507;
	Fri, 11 May 2007 13:48:17 GMT
	(envelope-from mjacob@repoman.freebsd.org)
Received: (from mjacob@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4BDmHYD041506;
	Fri, 11 May 2007 13:48:17 GMT (envelope-from mjacob)
Message-Id: <200705111348.l4BDmHYD041506@repoman.freebsd.org>
From: Matt Jacob <mjacob@FreeBSD.org>
Date: Fri, 11 May 2007 13:48:17 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/dev/isp isp_sbus.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: Fri, 11 May 2007 13:48:17 -0000

mjacob      2007-05-11 13:48:17 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/dev/isp          isp_sbus.c 
  Log:
  mfc: bad merge fix
  
  Revision  Changes    Path
  1.15.8.9  +1 -1      src/sys/dev/isp/isp_sbus.c