tree 796a66c7ad29ae1d2d60133fdcd7167a513fac49
parent fb4284b2b7cfaf3b89557667587cca90bddccc59
parent 744d18dbfae07482ea461701b0aaec3a75ec9224
author Linus Torvalds <torvalds@linux-foundation.org> 1217202475 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1217202475 -0700

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