From owner-freebsd-smp  Wed Nov 20 13:40:31 1996
Return-Path: owner-smp
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id NAA12113
          for smp-outgoing; Wed, 20 Nov 1996 13:40:31 -0800 (PST)
Received: (from peter@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id NAA12096
          for freebsd-smp; Wed, 20 Nov 1996 13:40:20 -0800 (PST)
Date: Wed, 20 Nov 1996 13:40:20 -0800 (PST)
From: Peter Wemm <peter>
Message-Id: <199611202140.NAA12096@freefall.freebsd.org>
To: freebsd-smp
Subject: cvs commit:  sys/kern init_main.c kern_clock.c kern_exit.c kern_fork.c kern_shutdown.c kern_sig.c kern_synch.c vfs_bio.c
Sender: owner-smp@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

peter       96/11/20 13:40:18

  Modified:    kern      init_main.c kern_clock.c kern_exit.c kern_fork.c 
                        kern_shutdown.c kern_sig.c kern_synch.c vfs_bio.c
  Log:
  merge easy conflicts
  
  Revision  Changes    Path
  1.30      +8 -2      sys/kern/init_main.c
  1.3       +4 -1      sys/kern/kern_clock.c
  1.10      +5 -2      sys/kern/kern_exit.c
  1.8       +3 -2      sys/kern/kern_fork.c
  1.6       +8 -2      sys/kern/kern_shutdown.c
  1.6       +2 -9      sys/kern/kern_sig.c
  1.12      +6 -2      sys/kern/kern_synch.c
  1.11      +41 -45    sys/kern/vfs_bio.c