| commit | 8c35bf368c4e533d07610810e4c3b84c34c8e201 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Oct 13 16:51:29 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Oct 13 16:51:29 2010 -0700 |
| tree | ff998cc7192bac73452c64ef5f2a45dd7ea3e7d5 | |
| parent | fec896e21b65278a67b3a98073eef23351a74a4a [diff] | |
| parent | b1e86db1de2e8bc2be9fb94fae3451c2a776e8c1 [diff] |
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