Merge cleanup

bk: 54f1a526T47sofPpetCSRqgvzwSNug

diff --git a/ChangeLog b/ChangeLog
index 1d3f6bebb314ee1a80e64b007da482d3f101888b..511f52e7fcbd4e313c5396d06b131092e1d60b6a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 Below are from 4.2.8p2:
 * [Bug 2756] ntpd hangs in startup with gcc 3.3.5 on ARM.
 * [Bug 2757] Quiet compiler warnings.
+* [Bug 2759] Expose nonvolatile/clk_wander_threshold to ntpq.
 (4.3.2) 2015/02/25 Released by Harlan Stenn <stenn@ntp.org>
 (4.3.1) 2015/02/21 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p2: