From: Ulrich Drepper <drepper@gmail.com>
Date: Mon, 15 Aug 2011 02:21:54 +0000 (-0400)
Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc
X-Git-Tag: glibc-2.15~405
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f3ed22607e8bf724b697c16876dbb76bb2418db6;p=platform%2Fupstream%2Fglibc.git

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

Conflicts:
	ChangeLog
---

f3ed22607e8bf724b697c16876dbb76bb2418db6
diff --cc ChangeLog
index eaa7b7e,4569518..4092e50
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,23 +1,28 @@@
 +2011-08-14  Ulrich Drepper  <drepper@gmail.com>
 +
 +	* nscd/servicescache.c (cache_addserv): Make sure written is always
 +	initialized.
 +
+ 2011-08-14  Roland McGrath  <roland@hack.frob.com>
+ 
+ 	* string/strncat.c (STRNCAT): Use prototype definition.
+ 
+ 	* locale/Makefile (locale-CPPFLAGS): Renamed CPPFLAGS-locale-programs.
+ 	(locale-CPPFLAGS): New variable; put LOCALEDIR, LOCALE_ALIAS_PATH and
+ 	-Iprograms here.
+ 	(cppflags-iterator.mk sequence): Use locale-programs in place of nonlib.
+ 	(localedef-modules): Add localedef.
+ 	(locale-modules): Add locale.
+ 
+ 	* sysdeps/generic/ldsodefs.h (struct unique_sym): Add a const.
+ 	* elf/rtld.c (dl_main): Invert order of assignment in last change,
+ 	to avoid a warning.
+ 
+ 2011-08-14  David S. Miller  <davem@davemloft.net>
+ 
+ 	* sysdeps/unix/sysv/linux/sparc/bits/resource.h (RLIM_INFINITY,
+ 	RLIM64_INFINITY): Fix 64-bit values for 32-bit sparc.
+ 
  2011-08-13  Ulrich Drepper  <drepper@gmail.com>
  
  	* elf/dl-open.c: Rename show_scope to _dl_schow_scope and export.