From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 May 2011 22:19:39 +0000 (-0700)
Subject: Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=cf70cc5b9d6a07d21ffd521aee690d26315d1bdf;p=openwrt%2Fstaging%2Fblogic.git

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
---

cf70cc5b9d6a07d21ffd521aee690d26315d1bdf