diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /fs/ecryptfs/main.c | |
parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
Diffstat (limited to 'fs/ecryptfs/main.c')
-rw-r--r-- | fs/ecryptfs/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c index c27c0ecf90bc..fdb2eb0ad09e 100644 --- a/fs/ecryptfs/main.c +++ b/fs/ecryptfs/main.c | |||
@@ -276,7 +276,7 @@ static void ecryptfs_init_mount_crypt_stat( | |||
276 | /** | 276 | /** |
277 | * ecryptfs_parse_options | 277 | * ecryptfs_parse_options |
278 | * @sb: The ecryptfs super block | 278 | * @sb: The ecryptfs super block |
279 | * @options: The options pased to the kernel | 279 | * @options: The options passed to the kernel |
280 | * | 280 | * |
281 | * Parse mount options: | 281 | * Parse mount options: |
282 | * debug=N - ecryptfs_verbosity level for debug output | 282 | * debug=N - ecryptfs_verbosity level for debug output |
@@ -840,7 +840,7 @@ static int __init ecryptfs_init(void) | |||
840 | } | 840 | } |
841 | rc = ecryptfs_init_messaging(); | 841 | rc = ecryptfs_init_messaging(); |
842 | if (rc) { | 842 | if (rc) { |
843 | printk(KERN_ERR "Failure occured while attempting to " | 843 | printk(KERN_ERR "Failure occurred while attempting to " |
844 | "initialize the communications channel to " | 844 | "initialize the communications channel to " |
845 | "ecryptfsd\n"); | 845 | "ecryptfsd\n"); |
846 | goto out_destroy_kthread; | 846 | goto out_destroy_kthread; |