Merge branch 'for-next' into for-linus

Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/s390/crypto/sha_common.c b/arch/s390/crypto/sha_common.c
index 7903ec47e6b9..f42dbabc0d30 100644
--- a/arch/s390/crypto/sha_common.c
+++ b/arch/s390/crypto/sha_common.c
@@ -79,7 +79,7 @@ int s390_sha_final(struct shash_desc *desc, u8 *out)
         memset(ctx->buf + index, 0x00, end - index - 8);
 
         /*
-         * Append message length. Well, SHA-512 wants a 128 bit lenght value,
+         * Append message length. Well, SHA-512 wants a 128 bit length value,
          * nevertheless we use u64, should be enough for now...
          */
         bits = ctx->count * 8;