From: Linus Torvalds Date: Sun, 11 May 2014 09:06:13 +0000 (+0900) Subject: Merge branch 'for-3.15' of git://linux-nfs.org/~bfields/linux X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=7e338c9991ecee9c2ac7a4cee2c2e11ecb563d02;p=openwrt%2Fstaging%2Fblogic.git 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() --- 7e338c9991ecee9c2ac7a4cee2c2e11ecb563d02