projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9cf22e8 aa07c71)
Merge branch 'for-3.15' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 11 May 2014 09:06:13 +0000 (18:06 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 11 May 2014 09:06:13 +0000 (18:06 +0900)
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()


Trivial merge
John Crispins staging tree