From owner-cvs-sys  Sun Sep 21 10:17:55 1997
Return-Path: <owner-cvs-sys>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id KAA08522
          for cvs-sys-outgoing; Sun, 21 Sep 1997 10:17:55 -0700 (PDT)
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 KAA08376;
          Sun, 21 Sep 1997 10:15:46 -0700 (PDT)
From: Jun-ichiro Itoh <itojun@FreeBSD.ORG>
Received: (from itojun@localhost)
	by freefall.freebsd.org (8.8.6/8.8.5) id KAA10894;
	Sun, 21 Sep 1997 10:11:28 -0700 (PDT)
Date: Sun, 21 Sep 1997 10:11:28 -0700 (PDT)
Message-Id: <199709211711.KAA10894@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-sys@FreeBSD.ORG
Subject: cvs commit: src/sys/scsi scsi_all.h src/sys/i386/scsi aic7xxx.c
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

itojun      1997/09/21 10:11:27 PDT

  Modified files:        (Branch: RELENG_2_2)
    sys/scsi             scsi_all.h 
    sys/i386/scsi        aic7xxx.c 
  Log:
  merge from current: scsi RESERVATION CONFLICT support.
  
  Revision  Changes    Path
  1.13.10.1 +2 -1      src/sys/scsi/scsi_all.h
  1.81.2.29 +6 -1      src/sys/i386/scsi/aic7xxx.c