tree 269de2822a8ce9b771cb6f6a9c317dd8895a79c2
parent f6866fecd6fd8e44a6715da09844a4fd1b8484da
parent 52833e897fd8c6f62b3e5e27291fa9bc803f7460
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1203108281 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1203108281 -0800

Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

* 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  NFS: add missing spkm3 strings to mount option parser
  NFS: remove error field from nfs_readdir_descriptor_t
  NFS: missing spaces in KERN_WARNING
  NFS: Allow text-based mounts via compat_sys_mount
  NFS: fix reference counting for NFSv4 callback thread