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

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 37e87822d6497e1096f45bd77dcd4a79cab0b521,6dd445bb711c0adb52f1483816d6e79335b45d91..fa117e94d7e7f6b8707a6e47d319963389939865
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,14 +1,19 @@@
 +2011-09-15  Ulrich Drepper  <drepper@gmail.com>
 +
 +      * sysdeps/x86_64/fpu/bits/mathinline.h: Add fmax and fmin optimizations
 +      for __FINITE_MATH_ONLY__ == 1.
 +
+ 2011-09-15  Andreas Schwab  <schwab@redhat.com>
+ 
+       * sysdeps/powerpc/fpu/e_hypot.c (__ieee754_hypot): Use
+       __ieee754_sqrt instead of sqrt.
+       * sysdeps/powerpc/fpu/e_hypotf.c (__ieee754_hypotf): Use
+       __ieee754_sqrtf instead of sqrtf.
+       * sysdeps/powerpc/fpu/e_rem_pio2f.c (__ieee754_rem_pio2f): Use
+       __floorf instead of floorf.
+       * sysdeps/powerpc/fpu/k_rem_pio2f.c (__fp_kernel_rem_pio2f): Use
+       __floorf, __truncf instead of floorf, truncf.
+ 
  2011-09-14  Ulrich Drepper  <drepper@gmail.com>
  
        * sysdeps/x86_64/fpu/s_copysign.S [ELF]: Use correct section.