ChangeLog entries incorrectly applied.

diff --git a/ChangeLog b/ChangeLog
index 0504312..aa121ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2009-05-14  Jakub Jelinek  <jakub@redhat.com>
+
+       * sysdeps/unix/sysv/linux/i386/fallocate64.c (__fallocate64_l64):
+       Rename ...
+       (fallocate64): ... to this.
+       * sysdeps/unix/sysv/linux/fallocate64.c (__fallocate64_l64):
+       Rename ...
+       (fallocate64): ... to this.
+       * sysdeps/unix/sysv/linux/Versions (libc): Remove fallocate64.
+       * sysdeps/unix/sysv/linux/wordsize-64/Versions (libc): Add
+       fallocate64@@GLIBC_2.10.
+       * sysdeps/unix/sysv/linux/i386/Versions (libc): Add
+       fallocate64@@GLIBC_2.11.
+       * sysdeps/unix/sysv/linux/s390/s390-32/Versions (libc): Likewise.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions (libc): Likewise.
+       * sysdeps/unix/sysv/linux/sparc/sparc32/Versions (libc): Likewise.
+       * sysdeps/unix/sysv/linux/sh/Versions (libc): Likewise.
+
+2009-05-14  Jakub Jelinek  <jakub@redhat.com>
+
+       * nscd/selinux.c (nscd_avc_destroy): Removed.
+       * nscd/selinux.h (nscd_avc_destroy): Likewise.
+       * nscd/nscd.c (termination_handler): Don't call
+       nscd_avc_destroy.
+
 2009-05-15  Ulrich Drepper  <drepper@redhat.com>
 
        * math/libm-test.inc (expm1_test): Add test for range error.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index d596325..f3bd32f 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,28 +1,3 @@
-2009-05-14  Jakub Jelinek  <jakub@redhat.com>
-
-       * sysdeps/unix/sysv/linux/i386/fallocate64.c (__fallocate64_l64):
-       Rename ...
-       (fallocate64): ... to this.
-       * sysdeps/unix/sysv/linux/fallocate64.c (__fallocate64_l64):
-       Rename ...
-       (fallocate64): ... to this.
-       * sysdeps/unix/sysv/linux/Versions (libc): Remove fallocate64.
-       * sysdeps/unix/sysv/linux/wordsize-64/Versions (libc): Add
-       fallocate64@@GLIBC_2.10.
-       * sysdeps/unix/sysv/linux/i386/Versions (libc): Add
-       fallocate64@@GLIBC_2.11.
-       * sysdeps/unix/sysv/linux/s390/s390-32/Versions (libc): Likewise.
-       * sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions (libc): Likewise.
-       * sysdeps/unix/sysv/linux/sparc/sparc32/Versions (libc): Likewise.
-       * sysdeps/unix/sysv/linux/sh/Versions (libc): Likewise.
-
-2009-05-14  Jakub Jelinek  <jakub@redhat.com>
-
-       * nscd/selinux.c (nscd_avc_destroy): Removed.
-       * nscd/selinux.h (nscd_avc_destroy): Likewise.
-       * nscd/nscd.c (termination_handler): Don't call
-       nscd_avc_destroy.
-
 2009-05-15  Ulrich Drepper  <drepper@redhat.com>
 
        * cancellation.c (__pthread_disable_asynccancel): Correct the bits