From: Andreas Schwab <schwab@redhat.com>
Date: Tue, 9 Mar 2010 14:47:50 +0000 (+0100)
Subject: Merge remote branch 'origin/master' into fedora/master
X-Git-Tag: fedora/glibc-2.11.90-15~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35be409292e2aaab331d21d2bc42ed4c44477281;p=thirdparty%2Fglibc.git

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

35be409292e2aaab331d21d2bc42ed4c44477281
diff --cc ChangeLog
index 62dcc8cd3ef,7e5e7bb5b27..84196ee37dc
--- a/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]