about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-09-07 21:52:39 -0400
committerUlrich Drepper <drepper@gmail.com>2011-09-07 21:52:39 -0400
commita450513e1d51cb8fe46ba5ebd92399247060b980 (patch)
tree841c1c71f8a899f67c9d8e14cde9a85ffb9f6c16 /ChangeLog
parent08a300c956feeca7ccb9081f88701229da8e25c5 (diff)
parent59178ef977d3c8392eff263d40a16d7c741edca4 (diff)
downloadglibc-a450513e1d51cb8fe46ba5ebd92399247060b980.tar.gz
glibc-a450513e1d51cb8fe46ba5ebd92399247060b980.tar.xz
glibc-a450513e1d51cb8fe46ba5ebd92399247060b980.zip
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
	ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0eb1acc777..c90f2c7754 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,12 @@
 	* sysdeps/x86_64/dl-trampoline.S (_dl_runtime_profile): Simplify
 	AVX check.
 
+2011-09-07  Andreas Schwab  <schwab@redhat.com>
+
+	[BZ #13144]
+	* sysdeps/unix/sysv/linux/x86_64/bits/sem.h (semdid_ds): Revert
+	last change.
+
 2011-09-07  Ulrich Drepper  <drepper@gmail.com>
 
 	* sysdeps/unix/sysv/linux/x86_64/init-first.c