tree 5ff677e2f2225a8b7971c2bb84e1c66bc4c54d38
parent caa4a59574a39e6574664e82b92455d41eca27a8
parent 5b362ac3799ff4225c40935500f520cad4d7ed66
author Linus Torvalds <torvalds@linux-foundation.org> 1292345472 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1292345472 -0800

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

* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  NFS: Fix panic after nfs_umount()
  nfs: remove extraneous and problematic calls to nfs_clear_request
  nfs: kernel should return EPROTONOSUPPORT when not support NFSv4
  NFS: Fix fcntl F_GETLK not reporting some conflicts
  nfs: Discard ACL cache on mode update
  NFS: Readdir cleanups
  NFS: nfs_readdir_search_for_cookie() don't mark as eof if cookie not found
  NFS: Fix a memory leak in nfs_readdir
  Call the filesystem back whenever a page is removed from the page cache
  NFS: Ensure we use the correct cookie in nfs_readdir_xdr_filler