Merge remote branch 'origin/master' into fedora/master

diff --cc ChangeLog
Simple merge

diff --cc nptl/ChangeLog
Simple merge

diff --cc sysdeps/unix/sysv/linux/i386/bits/fcntl.h
Simple merge

diff --cc sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
Simple merge

diff --cc sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
Simple merge

diff --cc sysdeps/unix/sysv/linux/s390/bits/fcntl.h
Simple merge

diff --cc sysdeps/unix/sysv/linux/sh/bits/fcntl.h
Simple merge

diff --cc sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
Simple merge

diff --cc sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
Simple merge