From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 15 Feb 2008 20:44:41 +0000 (-0800)
Subject: Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
X-Git-Tag: v2.6.25-rc2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03df25dc0313fbde19534a187eec5829eb16dbc6;p=linux-2.6

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: add missing spkm3 strings to mount option parser
  NFS: remove error field from nfs_readdir_descriptor_t
  NFS: missing spaces in KERN_WARNING
  NFS: Allow text-based mounts via compat_sys_mount
  NFS: fix reference counting for NFSv4 callback thread
---

03df25dc0313fbde19534a187eec5829eb16dbc6