Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 0eb1acc7771a409f47c86b02efbdca5b5388f685,e0678f286775bccf234bedd02c79c6dc17f35097..c90f2c775417239f28e71335973380953c5ce718
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,9 +1,14 @@@
 +2011-07-24  H.J. Lu  <hongjiu.lu@intel.com>
 +
 +      * 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