Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6