Merge bk://bk2.ntp.org./ntp-dev

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-lose-ldisc-clk

bk: 4d866682pVAmck2C61gI6m-aqs2gGw

diff --cc ChangeLog
index a778cc4882eec1a876962b2776d0cbaa64136564,372ec07abeca563c56e1f7cb3bfa0a822b07f45f..f2c6d0830c2af919c30d5aa6f2050f80abc599f9
--- 1/ChangeLog
--- 2/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>