1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a5cfeee40..07dc77306d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-07-08  Feng Gao  <gfree.wind@gmail.com>
+
+	* libio/fileops.c: Use "|" instead of "+" when combine _IO_LINE_BUF
+	and _IO_UNBUFFERED.
+	* libio/oldfileops.c: Likewise.
+	* libio/wfileops.c: Likewise.
+
 2015-07-08  Mike Frysinger  <vapier@gentoo.org>
 
 	* nscd/selinux.c: Delete selinux/flask.h include.