Merge remote-tracking branch 'origin/release/2.14/master' into fedora/2.14/master

author Andreas Schwab <schwab@redhat.com>

Mon, 15 Aug 2011 12:25:11 +0000 (14:25 +0200)

committer Andreas Schwab <schwab@redhat.com>

Mon, 15 Aug 2011 12:25:11 +0000 (14:25 +0200)
author Andreas Schwab <schwab@redhat.com>
Mon, 15 Aug 2011 12:25:11 +0000 (14:25 +0200)
committer Andreas Schwab <schwab@redhat.com>
Mon, 15 Aug 2011 12:25:11 +0000 (14:25 +0200)
diff --cc ChangeLog
Simple merge
diff --cc nptl/ChangeLog
Simple merge
diff --cc nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
Simple merge
diff --cc nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
Simple merge
author	Andreas Schwab <schwab@redhat.com>
	Mon, 15 Aug 2011 12:25:11 +0000 (14:25 +0200)
committer	Andreas Schwab <schwab@redhat.com>
	Mon, 15 Aug 2011 12:25:11 +0000 (14:25 +0200)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
nptl/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S	patch \|	diff1 \|	diff2 \|	blob \| history
nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S	patch \|	diff1 \|	diff2 \|	blob \| history