diff options
author | Ulrich Drepper <drepper@gmail.com> | 2011-11-11 13:29:12 -0500 |
---|---|---|
committer | Ulrich Drepper <drepper@gmail.com> | 2011-11-11 13:29:12 -0500 |
commit | 1d8f7ddc04a4782c1bf2d6f48ce40e7d57caa920 (patch) | |
tree | b80014598ade05556449724881c200b49b5ffd2d /ChangeLog | |
parent | aaddc98c25727f896fc8ed36c5562dc46865dbe6 (diff) | |
parent | 95b7042bac3e2cfc6fef7aec6acc7d46dd50eba5 (diff) | |
download | glibc-1d8f7ddc04a4782c1bf2d6f48ce40e7d57caa920.tar.gz glibc-1d8f7ddc04a4782c1bf2d6f48ce40e7d57caa920.tar.xz glibc-1d8f7ddc04a4782c1bf2d6f48ce40e7d57caa920.zip |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index fe82103e8f..cfb381ad8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,11 @@ * libio/wfileops.c (_IO_wfile_underflow_mmap): Remove unused variable. * sysdeps/ieee754/dbl-64/mpsqrt.c (__mpsqrt): Likewise. +2011-11-11 Roland McGrath <roland@hack.frob.com> + + * include/unistd.h: Fix __readlink return type. + Reported by Chris Metcalf <cmetcalf@tilera.com>. + 2011-11-11 Ulrich Drepper <drepper@gmail.com> * stdlib/ucontext.h: Undo last change for makecontext. |