From: Ulrich Drepper <drepper@gmail.com>
Date: Thu, 30 Jun 2011 03:36:11 +0000 (-0400)
Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc
X-Git-Tag: glibc-2.15~498
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c0e54ff32dedae504a34d1f551b4a1f69c3130a;p=thirdparty%2Fglibc.git

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

Conflicts:
	ChangeLog
---

2c0e54ff32dedae504a34d1f551b4a1f69c3130a
diff --cc ChangeLog
index 16187bb0874,20604823014..48c7586c573
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,9 +1,15 @@@
 +2011-06-29  Ulrich Drepper  <drepper@gmail.com>
 +
 +	* nscd/grpcache.c (cache_addgr): Don't write notfound reply if we
 +	are re-adding the entry.
 +	* nscd/servicescache.c (cache_addserv): Likewise.
 +
+ 2011-06-30  Aurelien Jarno  <aurelien@aurel32.net>
+ 
+ 	* sysdeps/generic/dl-irel.h: fix protection against multiple
+ 	inclusions.
+ 	* sysdeps/generic/dl-irel.h (elf_ifunc_invoke): New.
+ 
  2011-06-28  Ulrich Drepper  <drepper@gmail.com>
  
  	[BZ #12935]