From owner-cvs-sys  Tue Nov 12 00:02:37 1996
Return-Path: owner-cvs-sys
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id AAA00655
          for cvs-sys-outgoing; Tue, 12 Nov 1996 00:02:37 -0800 (PST)
Received: (from phk@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id AAA00635;
          Tue, 12 Nov 1996 00:02:26 -0800 (PST)
Date: Tue, 12 Nov 1996 00:02:26 -0800 (PST)
From: Poul-Henning Kamp <phk>
Message-Id: <199611120802.AAA00635@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-sys
Subject: cvs commit:  src/sys/i386/boot/biosboot bios.S src/sys/i386/boot/netboot start2.S
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

phk         96/11/12 00:02:25

  Branch:      sys/i386/boot/biosboot  RELENG_2_2
               sys/i386/boot/netboot  RELENG_2_2
  Modified:    sys/i386/boot/biosboot  bios.S
               sys/i386/boot/netboot  start2.S
  Log:
  Merge from -current
  
  Revision  Changes    Path
  1.5.4.1   +25 -1     src/sys/i386/boot/biosboot/bios.S
  1.2.2.2   +4 -0      src/sys/i386/boot/netboot/start2.S