Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 Jun 2008 23:25:11 +0000 (16:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 Jun 2008 23:25:11 +0000 (16:25 -0700)
commit62786b9e81a2dbe9c073a2ade52d33a2627d6d85
treeed78a50e92a5cb5d2d792a510b769427bab3191c
parent27f4837cbfd87126e733d098824544b6841a4eb8
parent03fa9e84e5dc10aeacb0e4eb2f708cd9fc36a5b8
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: nfs_updatepage(): don't mark page as dirty if an error occurred
  NFS: Fix filehandle size comparisons in the mount code
  NFS: Reduce the NFS mount code stack usage.