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)
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.

1  2 
net/sunrpc/xprtsock.c

Simple merge