Merge branch 'master' into for-next

[mv-sheeva.git] / security / smack / smack_lsm.c

diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 0f2fc480fc612f08e9701d319018efad76ded438..276bdc7325e5474f6d844c1a6a1388dc84f3c1ca 100644 (file)
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -3227,7 +3227,7 @@ static __init int smack_init(void)
        cred = (struct cred *) current->cred;
        cred->security = &smack_known_floor.smk_known;
 
-       /* initilize the smack_know_list */
+       /* initialize the smack_know_list */
        init_smack_know_list();
        /*
         * Initialize locks