Merge branch 'master' into ibm/2.18/master

diff --cc ChangeLog
index cbb6a56eb454078a0a58baa3a03983f314150f78,fa588c9f9f32e5ae6ffdfd2781108ca76ddcce6f..8d937a99cc2a7ab563cdf29b206f0fe9ad828de3
--- 1/ChangeLog
--- 2/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.