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

3 files changed, 3 insertions, 3 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;
diff --git a/arch/s390/include/asm/cio.h b/arch/s390/include/asm/cio.h
index e85679af54dd..e34347d567a6 100644
--- a/arch/s390/include/asm/cio.h
+++ b/arch/s390/include/asm/cio.h
@@ -20,7 +20,7 @@
 /**
  * struct ccw1 - channel command word
  * @cmd_code: command code
- * @flags: flags, like IDA adressing, etc.
+ * @flags: flags, like IDA addressing, etc.
  * @count: byte count
  * @cda: data address
  *
diff --git a/arch/s390/kernel/sclp.S b/arch/s390/kernel/sclp.S
index 27af3bf3a009..2e82fdd89320 100644
--- a/arch/s390/kernel/sclp.S
+++ b/arch/s390/kernel/sclp.S
@@ -235,7 +235,7 @@ _sclp_print:
         lh      %r9,0(%r8)                      # update sccb length
         ar      %r9,%r6
         sth     %r9,0(%r8)
-        ar      %r7,%r6                         # update current mto adress
+        ar      %r7,%r6                         # update current mto address
         ltr     %r0,%r0                         # more characters?
         jnz     .LinitmtoS4
         l       %r2,.LwritedataS4-.LbaseS4(%r13)# write data