| commit | 2547d1d20f3a252567f974de8ce1c572a0815d5a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Aug 28 14:05:55 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Aug 28 14:05:55 2010 -0700 |
| tree | 786404cb38c6ca55ca46a63df570c119ca32561e | |
| parent | 7be0d4f90ad8e0f9591fd311765a212a42e26b13 [diff] | |
| parent | f6360efb83cd6dd1476cd758834c8277508c1f15 [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 NULL dereference in nfsd_statfs() nfsd4: fix downgrade/lock logic nfsd4: typo fix in find_any_file nfsd4: bad BUG() in preprocess_stateid_op