1 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 19bef8a..8e3373c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-10-20  Torvald Riegel  <triegel@redhat.com>
+
+	[BZ #15215]
+	* nptl/pthreadP.h (__PTHREAD_ONCE_INPROGRESS, __PTHREAD_ONCE_DONE,
+	__PTHREAD_ONCE_FORK_GEN_INCR): New.
+	* sysdeps/nptl/fork.c (__libc_fork): Use them.
+	* nptl/pthread_once.c (__pthread_once): Likewise.
+	Update comments.
+
 2014-10-20  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #14138]