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

diff --cc ChangeLog
index 3425762,a87f1e6..929500c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,19 +1,25 @@@
+ 2012-01-31  Joseph Myers  <joseph@codesourcery.com>
+ 
+       * sysdeps/powerpc/bits/mathdef.h (float_t): Always define as
+       float.
+       * sysdeps/sh/sh4/bits/mathdef.h: Likewise.
+       * sysdeps/sparc/bits/mathdef.h: Likewise.
+ 
+ 2012-01-31  Marek Polacek  <polacek@redhat.com>
+ 
+       * libio/libio.h: Don't define _PARAMS.
+       * locale/programs/config.h: Don't define PARAMS.
+       * stdlib/strtol_l.c: Likewise.
+       (__strtol_l): Remove PARAMS from the prototype.
+ 
  2012-01-31  Ulrich Drepper  <drepper@gmail.com>
  
 +      * malloc/malloc.c: Remove name translation.  Don't use mixed-cap
 +      names.  Just use the correct names.  Remove unnecessary wrapper
 +      functions.
 +      * malloc/arena.c: Likewise.
 +      * malloc/hooks.c: Likewise.
 +
        * malloc/arena.c (arena_get2): Really don't call __get_nprocs if
        ARENA_TEST says not to.  Simplify test for creation of a new arena.
        Partially based on a patch by Siddhesh Poyarekar <siddhesh@redhat.com>.