Merge branch 'master' into devel

Conflicts:
	arch/arm/include/asm/elf.h
	arch/arm/kernel/module.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c
index 8ee01b907332..c9902b5c1f2b 100644
--- a/drivers/scsi/arm/cumana_2.c
+++ b/drivers/scsi/arm/cumana_2.c
@@ -318,7 +318,7 @@ cumanascsi_2_set_proc_info(struct Scsi_Host *host, char *buffer, int length)
 {
         int ret = length;
 
-        if (length >= 11 && strcmp(buffer, "CUMANASCSI2") == 0) {
+        if (length >= 11 && strncmp(buffer, "CUMANASCSI2", 11) == 0) {
                 buffer += 11;
                 length -= 11;