From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 27 Jul 2008 23:47:55 +0000 (-0700)
Subject: Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c9272c4f9fbe2087beb3392f526dc5b19efaa56b;p=openwrt%2Fstaging%2Fblogic.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: Ensure we call nfs_sb_deactive() after releasing the directory inode
  nfs_remount oops when rebooting + possible fix
---

c9272c4f9fbe2087beb3392f526dc5b19efaa56b