diff --git a/[refs] b/[refs]
index bbd8749a8afe..1755e8315666 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00611c5cfc8dea0914c65134f62948a484780a30
+refs/heads/master: 584fc6d111c34a9a2512f6c7652dff29232bf70d
diff --git a/trunk/arch/powerpc/lib/e2a.c b/trunk/arch/powerpc/lib/e2a.c
index 4f88f4cc21e8..4b72ed8fd50e 100644
--- a/trunk/arch/powerpc/lib/e2a.c
+++ b/trunk/arch/powerpc/lib/e2a.c
@@ -103,4 +103,14 @@ unsigned char e2a(unsigned char x)
 }
 EXPORT_SYMBOL(e2a);
 
+unsigned char* strne2a(unsigned char *dest, const unsigned char *src, size_t n)
+{
+	int i;
+
+	n = strnlen(src, n);
 
+	for (i = 0; i < n; i++)
+		dest[i] = e2a(src[i]);
+
+	return dest;
+}
diff --git a/trunk/include/asm-powerpc/system.h b/trunk/include/asm-powerpc/system.h
index 41b7a5b3d701..65f5a7b2646b 100644
--- a/trunk/include/asm-powerpc/system.h
+++ b/trunk/include/asm-powerpc/system.h
@@ -171,6 +171,8 @@ extern u32 booke_wdt_period;
 
 /* EBCDIC -> ASCII conversion for [0-9A-Z] on iSeries */
 extern unsigned char e2a(unsigned char);
+extern unsigned char* strne2a(unsigned char *dest,
+		const unsigned char *src, size_t n);
 
 struct device_node;
 extern void note_scsi_host(struct device_node *, void *);