diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-02-05 08:48:03 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-02-05 08:48:03 -0500 |
| commit | 2faea5274f079630991800bd579f85a621f96ef5 (patch) | |
| tree | 4afb9032f0ae3a3e8b539e0abe40cda320989ac3 /net/sunrpc/clnt.c | |
| parent | 16c5ab1d3a6d1b11ed2966fa33a3a4fecd13a2bc (diff) | |
| parent | edac894389f9c9de2a1368c78809c824b343f3a5 (diff) | |
Merge branch 'for-linus' into for-next
Merge pending fixes that haven't pulled 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); | |||
| 555 | * rpc_clone_client_set_auth - Clone an RPC client structure and set its auth | 555 | * rpc_clone_client_set_auth - Clone an RPC client structure and set its auth |
| 556 | * | 556 | * |
| 557 | * @clnt: RPC client whose parameters are copied | 557 | * @clnt: RPC client whose parameters are copied |
| 558 | * @auth: security flavor for new client | 558 | * @flavor: security flavor for new client |
| 559 | * | 559 | * |
| 560 | * Returns a fresh RPC client or an ERR_PTR. | 560 | * Returns a fresh RPC client or an ERR_PTR. |
| 561 | */ | 561 | */ |