From: Dave Hart <hart@ntp.org>
Date: Sun, 20 Mar 2011 20:41:38 +0000 (+0000)
Subject: Merge bk://bk2.ntp.org./ntp-dev
X-Git-Tag: NTP_4_2_7P143~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7123553511da02672f9e899124b826bd4ffadba1;p=thirdparty%2Fntp.git

Merge bk://bk2.ntp.org./ntp-dev
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-lose-ldisc-clk

bk: 4d866682pVAmck2C61gI6m-aqs2gGw
---

7123553511da02672f9e899124b826bd4ffadba1
diff --cc ChangeLog
index a778cc488,372ec07ab..f2c6d0830
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,6 +1,7 @@@
+ * Remove kernel line discipline driver code for clk and chu, deprecate
+   related LDISC_ flags, and remove associated ntpd code to decode the
+   timestamps, remove clktest line discipline test program.
 +(4.2.7p141) 2011/03/20 Released by Harlan Stenn <stenn@ntp.org>
  * Add "ntpq -c iostats" similar to "ntpdc -c iostats".
  * Compare entire timestamp to reject duplicates in refclock_pps().
  (4.2.7p140) 2011/03/17 Released by Harlan Stenn <stenn@ntp.org>