From: Ulrich Drepper <drepper@gmail.com>
Date: Fri, 11 Nov 2011 18:29:12 +0000 (-0500)
Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc
X-Git-Tag: glibc-2.15~103
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1d8f7ddc04a4782c1bf2d6f48ce40e7d57caa920;p=platform%2Fupstream%2Fglibc.git

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

Conflicts:
	ChangeLog
---

1d8f7ddc04a4782c1bf2d6f48ce40e7d57caa920
diff --cc ChangeLog
index fe82103,33c7c9d..cfb381a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,8 +1,13 @@@
 +2011-10-30  Marek Polacek  <mpolacek@redhat.com>
 +
 +	* 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.