From owner-cvs-sys Sun Sep 1 00:30:47 1996 Return-Path: owner-cvs-sys Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id AAA12766 for cvs-sys-outgoing; Sun, 1 Sep 1996 00:30:47 -0700 (PDT) Received: (from gibbs@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id AAA12751; Sun, 1 Sep 1996 00:30:42 -0700 (PDT) Date: Sun, 1 Sep 1996 00:30:42 -0700 (PDT) From: "Justin T. Gibbs" Message-Id: <199609010730.AAA12751@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-sys Subject: cvs commit: src/sys - Imported sources Sender: owner-cvs-sys@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk gibbs 96/09/01 00:30:41 src/sys - Imported sources Update of /home/ncvs/src/sys In directory freefall.freebsd.org:/a/gibbs/sandbox/sys Revision/Branch: 1.1.1 Log Message: Bring the rest of my changes in on a vendor branch. (Should have done it in one go before...) Status: Vendor Tag: NEW_SCSI Release Tags: v1 I src/sys/dev/aic7xxx/CVS C src/sys/dev/aic7xxx/aic7xxx.seq C src/sys/dev/aic7xxx/aic7xxx_asm.1 C src/sys/dev/aic7xxx/aic7xxx_asm.c C src/sys/dev/aic7xxx/aic7xxx_reg.h I src/sys/i386/scsi/CVS C src/sys/i386/scsi/93cx6.c C src/sys/i386/scsi/93cx6.h C src/sys/i386/scsi/aic7xxx.c C src/sys/i386/scsi/aic7xxx.h C src/sys/i386/scsi/bt.c C src/sys/i386/scsi/btreg.h I src/sys/i386/scsi/.#bt.c.1.9 C src/sys/i386/eisa/bt74x.c C src/sys/i386/eisa/aic7770.c C src/sys/i386/isa/aha1542.c C src/sys/i386/isa/aic6360.c C src/sys/i386/isa/ncr5380.c C src/sys/i386/isa/seagate.c C src/sys/i386/isa/ultra14f.c C src/sys/i386/isa/wd7000.c C src/sys/pci/ncr.c C src/sys/pci/ncrreg.h 20 conflicts created by this import. Use the following command to help the merge: cvs checkout -jNEW_SCSI:yesterday -jNEW_SCSI src/sys