From: Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
Date: Tue, 6 Aug 2013 17:13:45 +0000 (-0300)
Subject: Merge branch 'master' into ibm/2.18/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=733a36d81544dad38726489b43523cc0ac95095d;p=thirdparty%2Fglibc.git

Merge branch 'master' into ibm/2.18/master
---

733a36d81544dad38726489b43523cc0ac95095d
diff --cc ChangeLog
index cbb6a56eb45,fa588c9f9f3..8d937a99cc2
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,13 +1,21 @@@
+ 2013-08-03  David S. Miller  <davem@davemloft.net>
+ 
+ 	* po/ko.po: Update Korean translation from translation project.
+ 
+ 2013-08-01  David S. Miller  <davem@davemloft.net>
+ 
+ 	* manual/contrib.texi: Update entry for Siddhesh Poyarekar.  Add
+ 	entries for Will Newton, Andi Kleen, David Holsgrove, and Ondrej
+ 	Bilka.
+ 
 +2012-07-06  Ryan S. Arnold  <rsa@linux.vnet.ibm.com>
 +
 +	* elf/get-dynamic-info.h (elf_get_dynamic_info): Remove assert()
 +	around DT_RUNPATH and DT_RPATH which prevents running a dynamic
 +	linker with an embedded RPATH flag, which is what a compiler
 +	modified to embed a non-default INTERP section would do.
 +
 +
  2013-07-30  David S. Miller  <davem@davemloft.net>
  
  	* po/fr.po: Update French translation from translation project.