From: Ulrich Drepper <drepper@gmail.com>
Date: Fri, 3 Jun 2011 11:02:32 +0000 (-0400)
Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc
X-Git-Tag: glibc-2.14.1~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06c07b8b9fd21854c90d22b5b23196d78837262a;p=thirdparty%2Fglibc.git

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

Conflicts:
	ChangeLog
---

06c07b8b9fd21854c90d22b5b23196d78837262a
diff --cc ChangeLog
index 6a11ec67ea1,2aca74af0a2..64dbdc3ffa3
--- a/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