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

diff --cc ChangeLog
index f18c5cb,a70847e..3b59f29
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,17 +1,20 @@@
+ 2011-11-01  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+       * include/alloca.h (stackinfo_alloca_round): Define.
+       (extend_alloca): Use it.
+       [_STACK_GROWS_UP]: Correct check for adjacent allocation.
+       * elf/dl-deps.c (_dl_map_object_deps): Don't round alloca size
+       here.
+ 
+       * scripts/check-local-headers.sh: Ignore libaudit.h.
+ 
+       * nscd/Makefile (extra-objs): Make recursively expanded.
+ 
  2011-11-01  Ulrich Drepper  <drepper@gmail.com>
  
 +      * sysdeps/x86_64/strcmp.S: Fix test for non-ASCII locales.
 +      * sysdeps/x86_64/multiarch/strcmp-sse42.S: Likewise.
 +
        * posix/tst-rfc3484.c: Add missing __free_in6ai dummy function.
        * posix/tst-rfc3484-2.c: Likewise.
        * posix/tst-rfc3484-3.c: Likewise.