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

Conflicts:
	ChangeLog
	NEWS

diff --cc ChangeLog
index 52a2b53,299905a..34df6ba
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,18 +1,29 @@@
 +2011-05-27  Ulrich Drepper  <drepper@gmail.com>
 +
 +      [BZ #12814]
 +      * iconvdata/Makefile (tests): Add bug-iconv9.
 +      * iconvdata/bug-iconv9.c: New file.
 +
 +2011-05-27  Andreas Schwab  <schwab@redhat.com>
 +
 +      [BZ #12814]
 +      * iconvdata/iso-2022-jp.c (BODY): Fix invalid variable shadowing.
 +
+ 2011-05-25  Jakub Jelinek  <jakub@redhat.com>
+ 
+       * sysdeps/unix/sysv/linux/x86_64/sys/user.h
+       (struct user_regs_struct): Change intcs field back to cs.
+ 
+ 2011-05-25  Ulrich Drepper  <drepper@gmail.com>
+ 
+       * po/ja.po: Update from translation team.
+ 
+ 2011-05-23  Ulrich Drepper  <drepper@gmail.com>
+ 
+       [BZ #12795]
+       * sysdeps/unix/sysv/linux/bits/resource.h (RLIMIT_RTTIME): Define.
+       * sysdeps/unix/sysv/linux/sparc/bits/resource.h: Likewise.
+ 
  2011-05-20  Andreas Schwab  <schwab@redhat.com>
  
        * stdlib/longlong.h: Update from GCC.

diff --cc NEWS
index 1558ba4,f6ab0db..2cdb0cc
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -17,7 -17,7 +17,7 @@@ Version 2.1
    12545, 12551, 12582, 12583, 12587, 12597, 12601, 12611, 12625, 12626,
    12631, 12650, 12653, 12655, 12660, 12671, 12681, 12685, 12711, 12713,
    12714, 12717, 12723, 12724, 12734, 12738, 12746, 12766, 12775, 12777,
-   12782, 12788, 12792, 12814
 -  12782, 12788, 12792, 12795
++  12782, 12788, 12792, 12795, 12814
  
  * The RPC implementation in libc is obsoleted.  Old programs keep working
    but new programs cannot be linked with the routines in libc anymore.