From: Andreas Schwab <schwab@redhat.com>
Date: Mon, 24 Aug 2009 08:15:51 +0000 (+0200)
Subject: Merge commit 'origin/master' into fedora/master
X-Git-Tag: fedora/glibc-2.10.90-15~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=255acd161cc2d7752a4e79234dcba5d929c3e0a4;p=thirdparty%2Fglibc.git

Merge commit 'origin/master' into fedora/master

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

255acd161cc2d7752a4e79234dcba5d929c3e0a4
diff --cc ChangeLog
index 4eadfbb89b3,9f63c4db05b..1b11dd1678e
--- a/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.
  
 +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.
 +
- 	* sysdeps/powerpc/powerpc32/____longjmp_chk.S (CHECK_SP): Save lr
- 	before call.
- 	* sysdeps/powerpc/powerpc64/____longjmp_chk.S (CHECK_SP):
- 	Likewise.
- 
  2009-06-26  Ulrich Drepper  <drepper@redhat.com>
  
  	* resolv/resolv.h: Define RES_SNGLKUPREOP.