aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-06-03 07:02:32 -0400
committerUlrich Drepper <drepper@gmail.com>2011-06-03 07:02:32 -0400
commit06c07b8b9fd21854c90d22b5b23196d78837262a (patch)
tree1d6adec4505ce0935fc5663c950e2774c163dc73 /ChangeLog
parent3d29045b5e8329d97693eda8d98f1d1e60b99c8f (diff)
parent8c29731192565b9c917d6b97db78dcd302283df8 (diff)
downloadglibc-06c07b8b9fd21854c90d22b5b23196d78837262a.zip
glibc-06c07b8b9fd21854c90d22b5b23196d78837262a.tar.gz
glibc-06c07b8b9fd21854c90d22b5b23196d78837262a.tar.bz2
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a11ec6..64dbdc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
* 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