Merge commit 'v2.6.39-rc6' into x86/cleanups

[pandora-kernel.git] / drivers / staging / pohmelfs / crypto.c

diff --git a/drivers/staging/pohmelfs/crypto.c b/drivers/staging/pohmelfs/crypto.c
index 6540864..5cca24f 100644 (file)
--- a/drivers/staging/pohmelfs/crypto.c
+++ b/drivers/staging/pohmelfs/crypto.c
@@ -745,7 +745,7 @@ static int pohmelfs_crypto_init_handshake(struct pohmelfs_sb *psb)
 
        /*
         * At this point NETFS_CAPABILITIES response command
-        * should setup superblock in a way, which is acceptible
+        * should setup superblock in a way, which is acceptable
         * for both client and server, so if server refuses connection,
         * it will send error in transaction response.
         */