From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 5 Mar 2015 21:08:57 +0000 (+0000)
Subject: Merge cleanup
X-Git-Tag: NTP_4_3_6~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f39e61e35c54cf4536532847965a73c2eb5b5761;p=thirdparty%2Fntp.git

Merge cleanup

bk: 54f8c5e9BJZhvmkj9NtL40CY5aQ3ag
---

diff --git a/ChangeLog b/ChangeLog
index 9f7b1f0f2..f1f549227 100644
--- 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.