From owner-cvs-sys  Thu May 23 08:14:56 1996
Return-Path: owner-cvs-sys
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id IAA19311
          for cvs-sys-outgoing; Thu, 23 May 1996 08:14:56 -0700 (PDT)
Received: (from gibbs@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id IAA19290;
          Thu, 23 May 1996 08:14:42 -0700 (PDT)
Date: Thu, 23 May 1996 08:14:42 -0700 (PDT)
From: "Justin T. Gibbs" <gibbs>
Message-Id: <199605231514.IAA19290@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-sys
Subject: cvs commit:  src/sys/dev/aic7xxx aic7xxx.seq src/sys/i386/scsi aic7xxx.c src/sys/pci aic7870.c
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

gibbs       96/05/23 08:14:41

  Branch:      sys/dev/aic7xxx  RELENG_2_1_0
               sys/i386/scsi  RELENG_2_1_0
               sys/pci   RELENG_2_1_0
  Modified:    sys/dev/aic7xxx  aic7xxx.seq
               sys/i386/scsi  aic7xxx.c
               sys/pci   aic7870.c
  Log:
  Merge with HEAD:
  Use the right patch file this time.
  
  Revision  Changes    Path
  1.16.4.14 +4 -3      src/sys/dev/aic7xxx/aic7xxx.seq
  1.29.2.17 +10 -4     src/sys/i386/scsi/aic7xxx.c
  1.11.2.16 +2 -2      src/sys/pci/aic7870.c