Merge rsync://client.linux-nfs.org/pub/linux/nfs-2.6