merge cleanup

bk: 55bb2c11qxmb3ZmuXmgDtamNQgZwKA

diff --git a/ChangeLog b/ChangeLog
index 01e83fca21d9282928416cd33396b50d8771a914..7cf8ff8d9ca4e5c050da47ce628201327828eade 100644 (file)
--- 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ć.