From owner-cvs-sys  Tue Oct 15 19:16:34 1996
Return-Path: owner-cvs-sys
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id TAA27568
          for cvs-sys-outgoing; Tue, 15 Oct 1996 19:16:34 -0700 (PDT)
Received: (from jkh@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id TAA27511;
          Tue, 15 Oct 1996 19:16:16 -0700 (PDT)
Date: Tue, 15 Oct 1996 19:16:16 -0700 (PDT)
From: "Jordan K. Hubbard" <jkh>
Message-Id: <199610160216.TAA27511@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-sys
Subject: cvs commit:  src/sys/i386/i386 locore.s machdep.c userconfig.c
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

jkh         96/10/15 19:16:14

  Branch:      sys/i386/i386  RELENG_2_1_0
  Modified:    sys/i386/i386  locore.s machdep.c userconfig.c
  Log:
  Merge boot changes from HEAD to sync with sysinstall.
  
  Revision  Changes    Path
  1.52.4.4  +9 -1      src/sys/i386/i386/locore.s
  1.128.4.9 +5 -1      src/sys/i386/i386/machdep.c
  1.28.4.5  +141 -4    src/sys/i386/i386/userconfig.c