Merge cleanup

bk: 54f8c5e9BJZhvmkj9NtL40CY5aQ3ag

diff --git a/ChangeLog b/ChangeLog
index 9f7b1f0f2a262cdfa7dfd3836f173f9a447fe77d..f1f54922766db5e2dcca3eca49cb143293da12b5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+Below are from 4.2.8p2:
+* [Bug 2782] Refactor refclock_shm.c, add memory barrier protection.
 (4.3.5) 2015/03/05 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p2:
 * [Bug 2783] Quiet autoconf warnings about missing AC_LANG_SOURCE.