From owner-cvs-sys  Wed Nov  6 02:33:54 1996
Return-Path: owner-cvs-sys
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id CAA09856
          for cvs-sys-outgoing; Wed, 6 Nov 1996 02:33:54 -0800 (PST)
Received: (from phk@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id CAA09835;
          Wed, 6 Nov 1996 02:33:37 -0800 (PST)
Date: Wed, 6 Nov 1996 02:33:37 -0800 (PST)
From: Poul-Henning Kamp <phk>
Message-Id: <199611061033.CAA09835@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-sys
Subject: cvs commit:  src/sys/i386/isa diskslice_machdep.c fd.c
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

phk         96/11/06 02:33:36

  Branch:      sys/i386/isa  RELENG_2_2
  Modified:    sys/i386/isa  diskslice_machdep.c fd.c
  Log:
  Merge from -current
  
  Revision  Changes    Path
  1.21.2.1  +10 -6     src/sys/i386/isa/diskslice_machdep.c
  1.92.2.1  +36 -28    src/sys/i386/isa/fd.c