Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Feb 2010 22:06:28 +0000 (14:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Feb 2010 22:06:28 +0000 (14:06 -0800)
commitefa82bab8e3509bb2c4a8044de5909b8bab96cfd
tree99288d83deb78f03a9fe6b1f5783579ceca6f862
parent06a57f4f20d7bf7c3796abd541a7d400483a4596
parentfdcb45777a3d1689c5541e1f85ee3ebbd197d2c1
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 the mapping of the NFSERR_SERVERFAULT error
  NFS: Remove a redundant check for PageFsCache in nfs_migrate_page()
  NFS: Fix a bug in nfs_fscache_release_page()