From: Ulrich Drepper <drepper@gmail.com>
Date: Sun, 9 Oct 2011 17:17:46 +0000 (-0400)
Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc
X-Git-Tag: glibc-2.15~253
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9db0846f214b39d2ecb58ab6cd7178a38dd401e;p=thirdparty%2Fglibc.git

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

Conflicts:
	ChangeLog
---

d9db0846f214b39d2ecb58ab6cd7178a38dd401e
diff --cc ChangeLog
index 5f08e635398,e70edd19f54..de8e8aa3a4d
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,16 +1,20 @@@
 +2011-10-09  Ulrich Drepper  <drepper@gmail.com>
 +
 +	* po/ja.po: Update from translation team.
 +
+ 2011-10-08  Roland McGrath  <roland@hack.frob.com>
+ 
+ 	* locale/programs/locarchive.c (prepare_address_space): New function.
+ 	(create_archive, enlarge_archive, open_archive): Use it.
+ 
+ 	* sysdeps/unix/sysv/linux/x86_64/time.c: Move #include <dl-vdso.h>
+ 	inside [SHARED], where it is used.
+ 
+ 	* nscd/nscd_proto.h: Declare __nscd_setnetgrent.
+ 
+ 	* nss/getent.c (netgroup_keys): Remove unused variable.
+ 	* sysdeps/ieee754/flt-32/s_isinf_nsf.c: Likewise.
+ 
  2011-10-08  Ulrich Drepper  <drepper@gmail.com>
  
  	* include/math.h: Declare __isinf_ns, __isinf_nsf, __isinf_nsl.