about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-05-15 21:03:49 -0700
committerUlrich Drepper <drepper@redhat.com>2009-05-15 21:03:49 -0700
commit6dd78596d56c61e952acf1ab75fe17ab62f768c1 (patch)
tree431514d3ef1eae9773282271eaf1981089cf4a83
parent1f3615a1c97a030bca59f728f998947f852679b9 (diff)
downloadglibc-6dd78596d56c61e952acf1ab75fe17ab62f768c1.tar.gz
glibc-6dd78596d56c61e952acf1ab75fe17ab62f768c1.tar.xz
glibc-6dd78596d56c61e952acf1ab75fe17ab62f768c1.zip
ChangeLog entries incorrectly applied.
-rw-r--r--ChangeLog25
-rw-r--r--nptl/ChangeLog25
2 files changed, 25 insertions, 25 deletions
diff --git a/ChangeLog b/ChangeLog
index 050431278b..aa121bae3f 100644
--- 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 d596325419..f3bd32f577 100644
--- 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