summaryrefslogtreecommitdiff
path: root/fs/ecryptfs/keystore.c
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2011-07-16 18:10:35 +0200
committerJiri Kosina <jkosina@suse.cz>2011-07-22 16:47:15 +0200
commitdf2e301fee3c2c2a87592151397ad7699bb14c37 (patch)
tree09364e1443d8cac6c415af5e8d07b2b37793b68e /fs/ecryptfs/keystore.c
parent497888cf69bf607ac1fe061a6437e0a670b0022f (diff)
downloadlinux-df2e301fee3c2c2a87592151397ad7699bb14c37.tar.gz
fs: Merge split strings
No idea why these were split in the first place... Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'fs/ecryptfs/keystore.c')
-rw-r--r--fs/ecryptfs/keystore.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
index 27a7fefb83eb..fa8049ecdc64 100644
--- a/fs/ecryptfs/keystore.c
+++ b/fs/ecryptfs/keystore.c
@@ -2248,7 +2248,7 @@ write_tag_3_packet(char *dest, size_t *remaining_bytes,
auth_tok->token.password.session_key_encryption_key,
crypt_stat->key_size);
ecryptfs_printk(KERN_DEBUG,
- "Cached session key " "encryption key: \n");
+ "Cached session key encryption key:\n");
if (ecryptfs_verbosity > 0)
ecryptfs_dump_hex(session_key_encryption_key, 16);
}