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

diff --cc ChangeLog
index 8b8235b,5899b6a..5c4ffa7
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,7 +1,16 @@@
 +2014-01-03  Andrew Hunter  <ahh@google.com>
 +
 +      * elf/dl-open.c (): New comment.
 +      * elf/dl-reloc.c (_dl_try_allocate_static_tls): Use
 +      atomic_compare_and_exchange_bool_acq
 +      (_dl_allocate_static_tls): Block signals.
 +      * elf/dl-tls.c (allocate_and_init): Return void.
 +      (_dl_update_slotinfo): Block signals, use atomic update.
 +
  2014-01-03  Joseph Myers  <joseph@codesourcery.com>
  
+       * sysdeps/powerpc/nofpu/libm-test-ulps: Regenerated.
+ 
        * math/auto-libm-test-in: Mark various tests with
        xfail-rounding:ldbl-128ibm.
        * math/auto-libm-test-out: Regenerated.