From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 Oct 2010 23:51:29 +0000 (-0700)
Subject: Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v2.6.36-rc8~5
X-Git-Url: http://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=8c35bf368c4e533d07610810e4c3b84c34c8e201

Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.36' of git://linux-nfs.org/~bfields/linux:
  nfsd: fix BUG at fs/nfsd/nfsfh.h:199 on unlink
---

8c35bf368c4e533d07610810e4c3b84c34c8e201