diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-30 13:12:23 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-30 13:12:29 +1100 |
| commit | 5b231629b657676d3ada91c8e7e4d7089c7dd5f4 (patch) | |
| tree | 57f15ad7555bc720accf0dd29a53670b388ca813 /net/sunrpc | |
| parent | 674a134404d23825dfd3cb209eec5a3776119dc2 (diff) | |
| parent | 7905e357ebe67a26d9dc8caa1a0b8346431b5f0d (diff) | |
Merge remote branch 'net/master'
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
Diffstat (limited to 'net/sunrpc')
| -rw-r--r-- | net/sunrpc/auth_gss/gss_spkm3_token.c | 2 | ||||
| -rw-r--r-- | net/sunrpc/bc_svc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/auth_gss/gss_spkm3_token.c b/net/sunrpc/auth_gss/gss_spkm3_token.c index 3308157436d2..a99825d7caa0 100644 --- a/net/sunrpc/auth_gss/gss_spkm3_token.c +++ b/net/sunrpc/auth_gss/gss_spkm3_token.c @@ -223,7 +223,7 @@ spkm3_verify_mic_token(unsigned char **tokp, int *mic_hdrlen, unsigned char **ck /* only support SPKM_MIC_TOK */ if((ptr[6] != 0x01) || (ptr[7] != 0x01)) { - dprintk("RPC: ERROR unsupported SPKM3 token \n"); + dprintk("RPC: ERROR unsupported SPKM3 token\n"); goto out; } diff --git a/net/sunrpc/bc_svc.c b/net/sunrpc/bc_svc.c index f0c05d3311c1..7dcfe0cc3500 100644 --- a/net/sunrpc/bc_svc.c +++ b/net/sunrpc/bc_svc.c @@ -60,7 +60,7 @@ int bc_send(struct rpc_rqst *req) rpc_put_task(task); } return ret; - dprintk("RPC: bc_send ret= %d \n", ret); + dprintk("RPC: bc_send ret= %d\n", ret); } #endif /* CONFIG_NFS_V4_1 */ |