From: Linus Torvalds Date: Mon, 23 Jun 2008 23:25:11 +0000 (-0700) Subject: Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 X-Git-Tag: v2.6.26-rc8~9 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=62786b9e81a2dbe9c073a2ade52d33a2627d6d85;p=linux-2.6-omap-h63xx.git 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. --- 62786b9e81a2dbe9c073a2ade52d33a2627d6d85