merge cleanup

bk: 55b57b47SDF31o6NS3Q1P5dUv2e4VQ

diff --git a/ChangeLog b/ChangeLog
index 15b0ba8922bccd831dc63ba3192e18a035e59c35..b397a832335456230e49945130443d46373e6823 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+Below are from 4.2.8p4:
+* [Bug 2817] Stop locking ntpd into memory by default under Linux.  H.Stenn.
 (4.3.64) 2015/07/26 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p4:
 * [Bug 2886] Mis-spelling: "outlyer" should be "outlier".  dave@horsfall.org