diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-01-29 11:33:37 +1100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-01-29 11:33:37 +1100 |
commit | dfd0436ad0ce139467b124c646fa65ee2635e14a (patch) | |
tree | abf9d83c704417cdd484243c12aeffee6b185aba /net/sunrpc/clnt.c | |
parent | b9818c3312da66f4b83a4a2e8650628be1237cb5 (diff) | |
parent | 689dfa894c57842a05bf6dc9f97e6bb71ec5f386 (diff) | |
download | linux-dfd0436ad0ce139467b124c646fa65ee2635e14a.tar.bz2 |
Merge branch 'merge' into next
Merge "merge" branch to bring in various bug fixes that are
going into 3.8
Diffstat (limited to 'net/sunrpc/clnt.c')
-rw-r--r-- | net/sunrpc/clnt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 1915ffe598e3..507b5e84fbdb 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -555,7 +555,7 @@ EXPORT_SYMBOL_GPL(rpc_clone_client); * rpc_clone_client_set_auth - Clone an RPC client structure and set its auth * * @clnt: RPC client whose parameters are copied - * @auth: security flavor for new client + * @flavor: security flavor for new client * * Returns a fresh RPC client or an ERR_PTR. */ |