Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jul 2008 23:47:55 +0000 (16:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jul 2008 23:47:55 +0000 (16:47 -0700)
commitc9272c4f9fbe2087beb3392f526dc5b19efaa56b
tree796a66c7ad29ae1d2d60133fdcd7167a513fac49
parentfb4284b2b7cfaf3b89557667587cca90bddccc59
parent744d18dbfae07482ea461701b0aaec3a75ec9224
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: Ensure we call nfs_sb_deactive() after releasing the directory inode
  nfs_remount oops when rebooting + possible fix