]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f6866fe 52833e8)
Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 15 Feb 2008 20:44:41 +0000 (12:44 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 15 Feb 2008 20:44:41 +0000 (12:44 -0800)
commit03df25dc0313fbde19534a187eec5829eb16dbc6
tree269de2822a8ce9b771cb6f6a9c317dd8895a79c2tree | snapshot
parentf6866fecd6fd8e44a6715da09844a4fd1b8484dacommit | diff
parent52833e897fd8c6f62b3e5e27291fa9bc803f7460commit | diff
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
Linux 2.6 source tree