diff for duplicates of <ae8a6146afc9dddbbf342b3a77b9bf44618511dd.1398216022.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index 95c2b4a..123a5ae 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -27,7 +27,7 @@ index 9383b84..da69afc 100644
status = "disabled";
};
+
-+ msiof0: spi@e6e20000 {
++ msiof0: spi at e6e20000 {
+ compatible = "renesas,msiof-r8a7790";
+ reg = <0 0xe6e20000 0 0x0064>;
+ interrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>;
@@ -37,7 +37,7 @@ index 9383b84..da69afc 100644
+ status = "disabled";
+ };
+
-+ msiof1: spi@e6e10000 {
++ msiof1: spi at e6e10000 {
+ compatible = "renesas,msiof-r8a7790";
+ reg = <0 0xe6e10000 0 0x0064>;
+ interrupts = <0 157 IRQ_TYPE_LEVEL_HIGH>;
@@ -47,7 +47,7 @@ index 9383b84..da69afc 100644
+ status = "disabled";
+ };
+
-+ msiof2: spi@e6e00000 {
++ msiof2: spi at e6e00000 {
+ compatible = "renesas,msiof-r8a7790";
+ reg = <0 0xe6e00000 0 0x0064>;
+ interrupts = <0 158 IRQ_TYPE_LEVEL_HIGH>;
@@ -57,7 +57,7 @@ index 9383b84..da69afc 100644
+ status = "disabled";
+ };
+
-+ msiof3: spi@e6c90000 {
++ msiof3: spi at e6c90000 {
+ compatible = "renesas,msiof-r8a7790";
+ reg = <0 0xe6c90000 0 0x0064>;
+ interrupts = <0 159 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/a/content_digest b/N1/content_digest
index c8d9d39..30da6ec 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
"ref\0cover.1398216022.git.horms+renesas\@verge.net.au\0"
]
[
- "From\0Simon Horman <horms+renesas\@verge.net.au>\0"
+ "From\0horms+renesas\@verge.net.au (Simon Horman)\0"
]
[
"Subject\0[PATCH 04/33] ARM: shmobile: r8a7790 dtsi: Add MSIOF nodes and aliases\0"
]
[
- "Date\0Wed, 23 Apr 2014 01:25:32 +0000\0"
+ "Date\0Wed, 23 Apr 2014 10:25:32 +0900\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -49,7 +49,7 @@
" \t\tstatus = \"disabled\";\n",
" \t};\n",
"+\n",
- "+\tmsiof0: spi\@e6e20000 {\n",
+ "+\tmsiof0: spi at e6e20000 {\n",
"+\t\tcompatible = \"renesas,msiof-r8a7790\";\n",
"+\t\treg = <0 0xe6e20000 0 0x0064>;\n",
"+\t\tinterrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -59,7 +59,7 @@
"+\t\tstatus = \"disabled\";\n",
"+\t};\n",
"+\n",
- "+\tmsiof1: spi\@e6e10000 {\n",
+ "+\tmsiof1: spi at e6e10000 {\n",
"+\t\tcompatible = \"renesas,msiof-r8a7790\";\n",
"+\t\treg = <0 0xe6e10000 0 0x0064>;\n",
"+\t\tinterrupts = <0 157 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -69,7 +69,7 @@
"+\t\tstatus = \"disabled\";\n",
"+\t};\n",
"+\n",
- "+\tmsiof2: spi\@e6e00000 {\n",
+ "+\tmsiof2: spi at e6e00000 {\n",
"+\t\tcompatible = \"renesas,msiof-r8a7790\";\n",
"+\t\treg = <0 0xe6e00000 0 0x0064>;\n",
"+\t\tinterrupts = <0 158 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -79,7 +79,7 @@
"+\t\tstatus = \"disabled\";\n",
"+\t};\n",
"+\n",
- "+\tmsiof3: spi\@e6c90000 {\n",
+ "+\tmsiof3: spi at e6c90000 {\n",
"+\t\tcompatible = \"renesas,msiof-r8a7790\";\n",
"+\t\treg = <0 0xe6c90000 0 0x0064>;\n",
"+\t\tinterrupts = <0 159 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -93,4 +93,4 @@
"1.8.5.2"
]
-43c355988bb1d43547d59823cf101f18de7876247b2cdb294a2847a823cca136
+7b2e3cfc1fffd2843fd0e89d198ab2af860ec58242ce2a63c6033bd9c9191e91
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.