tree 4804c11071e693eb5d66799bb8e05431f7905c84
parent 087fbc9962e10a65fb0b542ecfc116ebf6cf1735
parent a75b9df9d3bfc3cd1083974c045ae31ce5f3434f
author Linus Torvalds <torvalds@linux-foundation.org> 1305325179 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1305325179 -0700

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:
  NFSv4.1: Ensure that layoutget uses the correct gfp modes
  NFSv4.1: remove pnfs_layout_hdr from pnfs_destroy_all_layouts tmp_list
  NFSv41: Resend on NFS4ERR_RETRY_UNCACHED_REP