From owner-cvs-sys  Fri Oct 17 05:40:59 1997
Return-Path: <owner-cvs-sys>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id FAA08928
          for cvs-sys-outgoing; Fri, 17 Oct 1997 05:40:59 -0700 (PDT)
          (envelope-from owner-cvs-sys)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id FAA08904;
          Fri, 17 Oct 1997 05:40:46 -0700 (PDT)
          (envelope-from itojun@FreeBSD.org)
From: Jun-ichiro Itoh <itojun@FreeBSD.ORG>
Received: (from itojun@localhost)
	by freefall.freebsd.org (8.8.6/8.8.5) id FAA18635;
	Fri, 17 Oct 1997 05:39:28 -0700 (PDT)
Date: Fri, 17 Oct 1997 05:39:28 -0700 (PDT)
Message-Id: <199710171239.FAA18635@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-sys@FreeBSD.ORG
Subject: cvs commit: src/sys/pci scsiiom.c
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

itojun      1997/10/17 05:39:28 PDT

  Modified files:        (Branch: RELENG_2_2)
    sys/pci              scsiiom.c 
  Log:
  Merge from current: scsi RESERVATION CONFLICT and BUSY support for
  Tekram scsi cards.  Checked with DC390
  
  equivalent to changes in 1.1 -> 1.2.
  
  Revision  Changes    Path
  1.1.1.1.2.1 +20 -0     src/sys/pci/scsiiom.c