diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-08 18:18:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-08 18:18:06 -0400 |
| commit | 861b7102b58ea55e171e503c2163efd60a4cc052 (patch) | |
| tree | e6e22375644c929057206e8e1e28b512ffcdeb74 /security/security.c | |
| parent | 35af25616c6c0c42416545f732d36b2ba7199519 (diff) | |
| parent | 7c17705e77b12b20fb8afb7c1b15dcdb126c0c12 (diff) | |
Merge branch 'for-3.17' of git://linux-nfs.org/~bfields/linux
Pull nfsd bugfixes from Bruce Fields:
"A couple minor nfsd bugfixes"
* 'for-3.17' of git://linux-nfs.org/~bfields/linux:
lockd: fix rpcbind crash on lockd startup failure
nfsd4: fix rd_dircount enforcement
Diffstat (limited to 'security/security.c')
0 files changed, 0 insertions, 0 deletions