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

Conflicts:
	ChangeLog

diff --cc ChangeLog
index c032f1a,7be8eb0..109b6a1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,8 +1,18 @@@
 +2012-04-09  Andreas Jaeger  <aj@suse.de>
 +
 +      [BZ #6894]
 +      * manual/filesys.texi (Directory Entries): Mention that d_namlen
 +      is an optional BSD extension.
 +
 +      [BZ #10254]
 +      * manual/stdio.texi (Opening Streams): Document additional fopen
 +      parameters.
 +
+ 2012-04-09  Roland McGrath  <roland@hack.frob.com>
+ 
+       * sysdeps/i386/fpu/bits/mathinline.h (__sincos_code): Don't clobber
+       %eax without telling the compiler.
+ 
  2012-04-09  Carlos O'Donell  <carlos_odonell@mentor.com>
  
        [BZ # 13963]