From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 31 Jul 2015 08:04:33 +0000 (+0000)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_68~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83effcc2a7d7c1d9b5b4c392974504be6b7c62ea;p=thirdparty%2Fntp.git

merge cleanup

bk: 55bb2c11qxmb3ZmuXmgDtamNQgZwKA
---

diff --git a/ChangeLog b/ChangeLog
index 01e83fca2..7cf8ff8d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+Below are from 4.2.8p4:
+* [Bug 2890] Ignore ENOBUFS on routing netlink socket.  Konstantin Khlebnikov.
 (4.3.67) 2015/07/29 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p4:
 * Added tests/ntpd/ntp_scanner.c test. Damir Tomić.