Merge Trond's nfs-for-next
authorJ. Bruce Fields <bfields@redhat.com>
Fri, 26 Apr 2013 15:37:29 +0000 (11:37 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Fri, 26 Apr 2013 15:37:43 +0000 (11:37 -0400)
commitc85b03ab200f6d2c2f80588d96d03c1f8fcaedc3
tree34f4f3200ef5db6ca93360879fffda050c04e1ca
parentbf8d909705e9d9bac31d9b8eac6734d2b51332a7
parentfd068b200fb86e8fa52368e6f6088d2ab297a5d7
Merge Trond's nfs-for-next

Merging Trond's nfs-for-next branch, mainly to get
b7993cebb841b0da7a33e9d5ce301a9fd3209165 "SUNRPC: Allow rpc_create() to
request that TCP slots be unlimited", which a small piece of the
gss-proxy work depends on.
net/sunrpc/xprtsock.c