From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 5 May 2010 16:48:21 +0000 (-0700)
Subject: Merge branch 'master' of ssh://sources.redhat.com/git/glibc
X-Git-Tag: fedora/glibc-2.12.90-1~1^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d05c55424406c947618d60f06fc0d119a4f0e54;p=thirdparty%2Fglibc.git

Merge branch 'master' of ssh://sources.redhat.com/git/glibc
---

5d05c55424406c947618d60f06fc0d119a4f0e54
diff --cc ChangeLog
index 0d3d04a59f3,bdbf33beed2..e3796063457
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,9 +1,13 @@@
+ 2010-05-05  Andreas Schwab  <schwab@redhat.com>
+ 
+ 	* INSTALL: Regenerate.
+ 
  2010-05-05  Ulrich Drepper  <drepper@redhat.com>
  
 +	[BZ #11571]
 +	* sysdeps/unix/sysv/linux/getlogin_r.c (__getlogin_r_loginuid): Handle
 +	too small buffers according to the standard.
 +
  	* sysdeps/unix/sysv/linux/kernel-features.h: Alpha doesn't have to be
  	handled here anymore.
  	Patch mostly by Matt Turner <mattst88@gmail.com>.