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

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 1d6f69f,bed8caf..d17671c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,21 +1,27 @@@
 +2012-04-08  Stephen Compall  <s11@member.fsf.org>
 +
 +      [BZ #6649]
 +      * manual/llio.texi (Opening and Closing Files): Add cross
 +      reference to explain mode argument.
 +
+ 2012-04-07  Mike Frysinger  <vapier@gentoo.org>
+ 
+       * sysdeps/i386/i686/memset_chk.S: Change PIC to SHARED.
+       * sysdeps/x86_64/memset_chk.S: Likewise.
+ 
+ 2012-04-07  David S. Miller  <davem@davemloft.net>
+ 
+       * elf/elf.h (R_SPARC_WDISP10): Define.
+       * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Handle
+       R_SPARC_SIZE32.
+       * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Handle
+       R_SPARC_SIZE64 and R_SPARC_H34.
+ 
+ 2012-04-07  Carlos O'Donell  <carlos_odonell@mentor.com>
+ 
+       * elf/dynamic-link.h (_ELF_DYNAMIC_DO_RELOC): Simplify
+       conditions and remove no longer applicable assertion.
+ 
  2012-04-06  H.J. Lu  <hongjiu.lu@intel.com>
  
        * bits/byteswap.h (__bswap_16): Removed.