Merge remote branch 'origin/master' into fedora/master

diff --cc ChangeLog
index 62dcc8cd3ef2ad4f51a0484f0cf9bc2e63dfd29e,7e5e7bb5b27de010f71079a097f6e1a265395f43..84196ee37dcf4bcd2957df72e1d8e5fdd59315ce
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -216,30 -405,6 +405,19 @@@
        * sysdeps/x86_64/fpu/fegetenv.c: Likewise
        * sysdeps/s390/fpu/fegetenv.c: Likewise.  Remove unused headers.
  
- 2010-02-12  H.J. Lu  <hongjiu.lu@intel.com>
- 
-       * sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S: Use unsigned
-       conditional jumps.
-       (shl_0_gobble_cache_loop_tail): Removed.
-       * sysdeps/i386/i686/multiarch/memcpy-ssse3.S: Likewise.
- 
-       * sysdeps/i386/i686/multiarch/memset-sse2-rep.S: Use unsigned
-       conditional jumps.
-       * sysdeps/i386/i686/multiarch/memset-sse2.S: Likewise.
- 
 +2009-10-27  Aurelien Jarno  <aurelien@aurel32.net>
 +
 +      [BZ #10855]
 +      * locale/programs/locarchive.c: use MMAP_SHARED to reserve memory
 +      used later with MMAP_FIXED | MMAP_SHARED to cope with different
 +      alignment restrictions.
 +
 +2010-02-08  Andreas Schwab  <schwab@redhat.com>
 +
 +      [BZ #11155]
 +      * sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c: Include i386
 +      version.
 +
  2010-02-05  H.J. Lu  <hongjiu.lu@intel.com>
  
        [BZ #11230]

diff --cc nptl/ChangeLog
Simple merge