Merge commit 'origin/master' into fedora/master
commit255acd161cc2d7752a4e79234dcba5d929c3e0a4
authorAndreas Schwab <schwab@redhat.com>
Mon, 24 Aug 2009 08:15:51 +0000 (24 10:15 +0200)
committerAndreas Schwab <schwab@redhat.com>
Mon, 24 Aug 2009 08:15:51 +0000 (24 10:15 +0200)
tree94c1d111cce2137ee948ff0e9d735f7a3643ef78
parent593eff0f9e5bed517e0a8434507ee9f3f4d45b87
parenta0e25a886a9128b280b4c05bc9c6dd12377ea868
Merge commit 'origin/master' into fedora/master

Conflicts:
sysdeps/powerpc/powerpc64/____longjmp_chk.S
sysdeps/unix/sysv/linux/powerpc/powerpc64/____longjmp_chk.S
ChangeLog
nptl/ChangeLog
nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
posix/Makefile