Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Fri, 3 Jun 2011 11:02:32 +0000 (07:02 -0400)
committerUlrich Drepper <drepper@gmail.com>
Fri, 3 Jun 2011 11:02:32 +0000 (07:02 -0400)
Conflicts:
ChangeLog

1  2 
ChangeLog

diff --cc ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,8 +1,13 @@@
 +2011-06-02  H.J. Lu  <hongjiu.lu@intel.com>
 +
 +      * sysdeps/x86_64/multiarch/init-arch.c (__init_cpu_features):
 +      Assume Intel Core i3/i5/i7 processor if AVX is available.
 +
+ 2011-05-31  Ulrich Drepper  <drepper@gmail.com>
+       * sysdeps/unix/sysv/linux/dl-osinfo.h (_dl_setup_stack_chk_guard): Fix
+       typo.
  2011-05-31  Andreas Schwab  <schwab@redhat.com>
  
        * nscd/nscd_getserv_r.c (nscd_getserv_r): Don't free non-malloced