From owner-cvs-sys  Tue Jun 25 13:20:28 1996
Return-Path: owner-cvs-sys
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id NAA12712
          for cvs-sys-outgoing; Tue, 25 Jun 1996 13:20:28 -0700 (PDT)
Received: (from markm@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id NAA12601;
          Tue, 25 Jun 1996 13:20:06 -0700 (PDT)
Date: Tue, 25 Jun 1996 13:20:06 -0700 (PDT)
From: Mark Murray <markm>
Message-Id: <199606252020.NAA12601@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-sys
Subject: cvs commit:  src/sys/i386/i386 conf.c machdep.c mem.c src/sys/i386/isa syscons.c src/sys/i386/conf files.i386 src/sys/i386/isa/pcvt pcvt_hdr.h pcvt_kbd.c
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

markm       96/06/25 13:20:05

  Branch:      sys/i386/conf  RELENG_2_1_0
               sys/i386/i386  RELENG_2_1_0
               sys/i386/isa  RELENG_2_1_0
               sys/i386/isa/pcvt  RELENG_2_1_0
  Modified:    sys/i386/conf  files.i386
               sys/i386/i386  conf.c machdep.c mem.c
               sys/i386/isa  syscons.c
               sys/i386/isa/pcvt  pcvt_hdr.h pcvt_kbd.c
  Log:
  Merge with HEAD - bring in /dev/random
  
  Revision  Changes    Path
  1.98.4.11 +2 -1      src/sys/i386/conf/files.i386
  1.85.4.9  +3 -2      src/sys/i386/i386/Attic/conf.c
  1.128.4.8 +3 -1      src/sys/i386/i386/machdep.c
  1.9.8.3   +126 -8    src/sys/i386/i386/mem.c
  1.117.4.11 +4 -1      src/sys/i386/isa/syscons.c
  1.7.4.2   +3 -1      src/sys/i386/isa/pcvt/pcvt_hdr.h
  1.5.4.2   +9 -0      src/sys/i386/isa/pcvt/pcvt_kbd.c