From owner-cvs-sys  Tue Feb  4 13:04:24 1997
Return-Path: <owner-cvs-sys>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id NAA12096
          for cvs-sys-outgoing; Tue, 4 Feb 1997 13:04:24 -0800 (PST)
Received: (from jhay@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id NAA12089;
          Tue, 4 Feb 1997 13:04:22 -0800 (PST)
Date: Tue, 4 Feb 1997 13:04:22 -0800 (PST)
From: John Hay <jhay>
Message-Id: <199702042104.NAA12089@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-sys
Subject: cvs commit:  src/sys/kern kern_clock.c kern_ntptime.c src/sys/sys systm.h timex.h
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

jhay        97/02/04 13:04:21

  Branch:      sys/kern  RELENG_2_2
               sys/sys   RELENG_2_2
  Modified:    sys/kern  kern_clock.c kern_ntptime.c
               sys/sys   systm.h timex.h
  Log:
  Merge the ntp changes from current. This is the latest code from David Mills
  and is needed for the latest versions of xntpd.
  
  Revision  Changes    Path
  1.28.2.1  +252 -127  src/sys/kern/kern_clock.c
  1.9.4.1   +4 -1      src/sys/kern/kern_ntptime.c
  1.47.2.1  +3 -1      src/sys/sys/systm.h
  1.2.12.1  +14 -6     src/sys/sys/timex.h