Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Oct 2010 23:51:29 +0000 (16:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Oct 2010 23:51:29 +0000 (16:51 -0700)
commit8c35bf368c4e533d07610810e4c3b84c34c8e201
treeff998cc7192bac73452c64ef5f2a45dd7ea3e7d5
parentfec896e21b65278a67b3a98073eef23351a74a4a
parentb1e86db1de2e8bc2be9fb94fae3451c2a776e8c1
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