diff for duplicates of <1368703646-26418-3-git-send-email-lee.jones@linaro.org>
diff --git a/a/1.txt b/N1/1.txt
index 0deb5c1..2e5289e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -16,7 +16,7 @@ index 92fd4b74..6c25fbe 100644
status = "disabled";
};
+
-+ hash@a03c2000 {
++ hash at a03c2000 {
+ compatible = "stericsson,ux500-hash";
+ reg = <0xa03c2000 0x1000>;
+
@@ -30,11 +30,11 @@ index de585fd..3cadb5b 100644
--- a/arch/arm/boot/dts/snowball.dts
+++ b/arch/arm/boot/dts/snowball.dts
@@ -354,5 +354,9 @@
- cryp@a03cb000 {
+ cryp at a03cb000 {
status = "okay";
};
+
-+ hash@a03c2000 {
++ hash at a03c2000 {
+ status = "okay";
+ };
};
diff --git a/a/content_digest b/N1/content_digest
index 21e818f..64c27eb 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0001368703646-26418-1-git-send-email-lee.jones\@linaro.org\0"
]
[
- "From\0Lee Jones <lee.jones\@linaro.org>\0"
+ "From\0lee.jones\@linaro.org (Lee Jones)\0"
]
[
"Subject\0[PATCH 2/6] ARM: ux500: Add Device Tree nodes for the ux500 Hash device\0"
@@ -11,14 +11,7 @@
"Date\0Thu, 16 May 2013 12:27:22 +0100\0"
]
[
- "To\0linux-arm-kernel\@lists.infradead.org",
- " linux-kernel\@vger.kernel.org\0"
-]
-[
- "Cc\0arnd\@arndb.de",
- " linus.walleij\@stericsson.com",
- " srinidhi.kasagar\@stericsson.com",
- " Lee Jones <lee.jones\@linaro.org>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -45,7 +38,7 @@
" \t\t\tstatus = \"disabled\";\n",
" \t\t};\n",
"+\n",
- "+\t\thash\@a03c2000 {\n",
+ "+\t\thash at a03c2000 {\n",
"+\t\t\tcompatible = \"stericsson,ux500-hash\";\n",
"+\t\t\treg = <0xa03c2000 0x1000>;\n",
"+\n",
@@ -59,11 +52,11 @@
"--- a/arch/arm/boot/dts/snowball.dts\n",
"+++ b/arch/arm/boot/dts/snowball.dts\n",
"\@\@ -354,5 +354,9 \@\@\n",
- " \t\tcryp\@a03cb000 {\n",
+ " \t\tcryp at a03cb000 {\n",
" \t\t\tstatus = \"okay\";\n",
" \t\t};\n",
"+\n",
- "+\t\thash\@a03c2000 {\n",
+ "+\t\thash at a03c2000 {\n",
"+\t\t\tstatus = \"okay\";\n",
"+\t\t};\n",
" \t};\n",
@@ -72,4 +65,4 @@
"1.7.10.4"
]
-b886a97bc3523087c3a6486cfb993b32c282ff1ffa560066ffbe8636f6e40695
+ca2c194037b2f6b06138e0b03ceadf7e96c8c201697fae92d7597de0325cc6bf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.