Merge commit 'origin/master' into fedora/master

Conflicts:
	sysdeps/powerpc/powerpc64/____longjmp_chk.S
	sysdeps/unix/sysv/linux/powerpc/powerpc64/____longjmp_chk.S

diff --cc ChangeLog
index 4eadfbb89b32061481eba1e4b41588757df13daf,9f63c4db05bd894d6456c621ad9054ffd2356506..1b11dd1678e5de4d1b1ae764b84c5ba11b01a872
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -660,16 -691,6 +696,11 @@@
        out common code into new function get_common_indeces. Determine
        extended family and model for Intel processors.
  
-       * sysdeps/powerpc/powerpc32/____longjmp_chk.S (CHECK_SP): Save lr
-       before call.
-       * sysdeps/powerpc/powerpc64/____longjmp_chk.S (CHECK_SP):
-       Likewise.
- 
 +2009-06-26  Andreas Schwab  <aschwab@redhat.com>
 +
 +      * timezone/zic.c (stringzone): Don't try to generate a POSIX TZ
 +      string when the timezone ends in DST.
 +
  2009-06-26  Ulrich Drepper  <drepper@redhat.com>
  
        * resolv/resolv.h: Define RES_SNGLKUPREOP.

diff --cc nptl/ChangeLog
Simple merge

diff --cc nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
Simple merge

diff --cc posix/Makefile
Simple merge