From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 6 Jul 2010 14:49:58 +0000 (-0700)
Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc
X-Git-Tag: fedora/glibc-2.12.90-5~1^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb5e79feb71e6a9bf7fcb59a5e2c56ab09a08868;p=thirdparty%2Fglibc.git

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

Conflicts:
	ChangeLog
---

eb5e79feb71e6a9bf7fcb59a5e2c56ab09a08868
diff --cc ChangeLog
index 946e9455ce7,48c62f7caf1..a649f09ce7e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,8 +1,13 @@@
 +2010-07-06  Ulrich Drepper  <drepper@redhat.com>
 +
 +	* sysdeps/unix/sysv/linux/fpathconf.c (__fpathconf): Implement
 +	_PC_PIPE_BUF using F_GETPIPE_SZ.
 +
+ 2010-07-05  Roland McGrath  <roland@redhat.com>
+ 
+ 	* manual/arith.texi (Rounding Functions): Fix rint description
+ 	implicit in round description.
+ 
  2010-07-02  Ulrich Drepper  <drepper@redhat.com>
  
  	* elf/Makefile: Fix linking for a few tests to make recent linker