Merge remote-tracking branch 'origin/release/2.14/master' into fedora/2.14/master
commitae0f462bfd5ce158dee29e41b47a3e4862a04f92
authorAndreas Schwab <schwab@redhat.com>
Mon, 15 Aug 2011 12:25:11 +0000 (15 14:25 +0200)
committerAndreas Schwab <schwab@redhat.com>
Mon, 15 Aug 2011 12:25:11 +0000 (15 14:25 +0200)
tree442fdee956f492e0e2ab3f5e10a6e15b53d10f59
parentaf0639697455b54e2ade8556867a15893197ffe2
parent4eddf93f5cc2711187e5e397a76ed727b440e972
Merge remote-tracking branch 'origin/release/2.14/master' into fedora/2.14/master
ChangeLog
nptl/ChangeLog
nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S