| commit | 7e338c9991ecee9c2ac7a4cee2c2e11ecb563d02 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun May 11 18:06:13 2014 +0900 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun May 11 18:06:13 2014 +0900 |
| tree | ad8a383ae162657d7313bb13eedbe8fde736f0c3 | |
| parent | 9cf22e80df77b3f8459559e156f6322657e17090 [diff] | |
| parent | aa07c713ecfc0522916f3cd57ac628ea6127c0ec [diff] |
Merge branch 'for-3.15' of git://linux-nfs.org/~bfields/linux Pull nfsd fixes from Bruce Fields. * 'for-3.15' of git://linux-nfs.org/~bfields/linux: NFSD: Call ->set_acl with a NULL ACL structure if no entries NFSd: call rpc_destroy_wait_queue() from free_client() NFSd: Move default initialisers from create_client() to alloc_client()