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 - - * 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 * 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 + + * 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 * pthread_getattr_np.c (pthread_getattr_np): Set FD_CLOEXEC for