Merge remote-tracking branch 'origin/release/2.14/master' into fedora/2.14/master

diff --cc ChangeLog
Simple merge

diff --cc NEWS
index c6be68c09d032cd969af8a7686ad9a6f96f19604,a6b38323834a1f21ba85836bdef23a0a71015d9b..8edf1d385263c248fbe28c28df82d3a642cdd26b
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -18,8 -18,18 +18,8 @@@ Version 2.1
    12587, 12597, 12601, 12611, 12625, 12626, 12631, 12650, 12653, 12655,
    12660, 12671, 12681, 12684, 12685, 12711, 12713, 12714, 12717, 12723,
    12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792,
-   12795, 12811, 12813, 12814
+   12795, 12811, 12813, 12814, 12841
  
 -* The RPC implementation in libc is obsoleted.  Old programs keep working
 -  but new programs cannot be linked with the routines in libc anymore.
 -  Programs in need of RPC functionality must be linked against TI-RPC.
 -  The TI-RPC implementation is IPv6 enabled and there are other benefits.
 -
 -  Visible changes of this change include (obviously) the inability to link
 -  programs using RPC functions without referencing the TI-RPC library and the
 -  removal of the RPC headers from the glibc headers.
 -  Implemented by Ulrich Drepper.
 -
  * New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at,
    syncfs, setns, sendmmsg
  

diff --cc manual/libc.texinfo
Simple merge

diff --cc nptl/ChangeLog
Simple merge

diff --cc sysdeps/posix/getaddrinfo.c
Simple merge