about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-12-02 07:34:19 -0500
committerUlrich Drepper <drepper@gmail.com>2011-12-02 07:34:19 -0500
commitade60c89422f89551ee615101997fa329b8bceb6 (patch)
treebd91bfd434334783736c53df049a59c048b739c0
parentd4cc29a254db6bd3838aac79d9d0e91cfd467c9d (diff)
downloadglibc-ade60c89422f89551ee615101997fa329b8bceb6.tar.gz
glibc-ade60c89422f89551ee615101997fa329b8bceb6.tar.xz
glibc-ade60c89422f89551ee615101997fa329b8bceb6.zip
Fix CL
-rw-r--r--ChangeLog6
-rw-r--r--nptl/ChangeLog6
2 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index e512bbb122..2d68f29663 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,12 +24,6 @@
 	* string/strcoll_l.c (STRCOLL): Likewise.
 	* string/strxfrm_l.c (STRXFRM): Likewise.
 
-2011-11-28  Andreas Schwab  <schwab@redhat.com>
-
-	* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S: Handle
-	EAGAIN from FUTEX_WAIT_REQUEUE_PI.
-	* sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S: Likewise.
-
 2011-11-17  Ulrich Drepper  <drepper@gmail.com>
 
 	* Makefile.in: Remove CVSOPT handling.
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 9abaa26ba9..448aa9357f 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-28  Andreas Schwab  <schwab@redhat.com>
+
+	* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S: Handle
+	EAGAIN from FUTEX_WAIT_REQUEUE_PI.
+	* sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S: Likewise.
+
 2011-11-15  Ulrich Drepper  <drepper@gmail.com>
 
 	* pthread_getattr_np.c (pthread_getattr_np): Set FD_CLOEXEC for