diff for duplicates of <c7d1f08a0c91ad9796d6d1fac8eb913e8a6d4288.1431565427.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index 6dc30ee..b65ec27 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -17,7 +17,7 @@ index 4bb2f4c17321..f3b8430070b6 100644
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -1273,7 +1273,7 @@
- msiof0: spi@e6e20000 {
+ msiof0: spi at e6e20000 {
compatible = "renesas,msiof-r8a7790";
- reg = <0 0xe6e20000 0 0x0064>, <0 0xe7e20000 0 0x0064>;
+ reg = <0 0xe6e20000 0 0x0064>;
@@ -26,7 +26,7 @@ index 4bb2f4c17321..f3b8430070b6 100644
dmas = <&dmac0 0x51>, <&dmac0 0x52>;
@@ -1285,7 +1285,7 @@
- msiof1: spi@e6e10000 {
+ msiof1: spi at e6e10000 {
compatible = "renesas,msiof-r8a7790";
- reg = <0 0xe6e10000 0 0x0064>, <0 0xe7e10000 0 0x0064>;
+ reg = <0 0xe6e10000 0 0x0064>;
@@ -35,7 +35,7 @@ index 4bb2f4c17321..f3b8430070b6 100644
dmas = <&dmac0 0x55>, <&dmac0 0x56>;
@@ -1297,7 +1297,7 @@
- msiof2: spi@e6e00000 {
+ msiof2: spi at e6e00000 {
compatible = "renesas,msiof-r8a7790";
- reg = <0 0xe6e00000 0 0x0064>, <0 0xe7e00000 0 0x0064>;
+ reg = <0 0xe6e00000 0 0x0064>;
@@ -44,7 +44,7 @@ index 4bb2f4c17321..f3b8430070b6 100644
dmas = <&dmac0 0x41>, <&dmac0 0x42>;
@@ -1309,7 +1309,7 @@
- msiof3: spi@e6c90000 {
+ msiof3: spi at e6c90000 {
compatible = "renesas,msiof-r8a7790";
- reg = <0 0xe6c90000 0 0x0064>, <0 0xe7c90000 0 0x0064>;
+ reg = <0 0xe6c90000 0 0x0064>;
diff --git a/a/content_digest b/N1/content_digest
index 35c21c5..ec7777c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
"ref\0cover.1431565427.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 01/31] ARM: shmobile: r8a7790: Remove MSIOF address from device tree\0"
]
[
- "Date\0Thu, 14 May 2015 01:06:30 +0000\0"
+ "Date\0Thu, 14 May 2015 10:06:30 +0900\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -39,7 +39,7 @@
"+++ b/arch/arm/boot/dts/r8a7790.dtsi\n",
"\@\@ -1273,7 +1273,7 \@\@\n",
" \n",
- " \tmsiof0: spi\@e6e20000 {\n",
+ " \tmsiof0: spi at e6e20000 {\n",
" \t\tcompatible = \"renesas,msiof-r8a7790\";\n",
"-\t\treg = <0 0xe6e20000 0 0x0064>, <0 0xe7e20000 0 0x0064>;\n",
"+\t\treg = <0 0xe6e20000 0 0x0064>;\n",
@@ -48,7 +48,7 @@
" \t\tdmas = <&dmac0 0x51>, <&dmac0 0x52>;\n",
"\@\@ -1285,7 +1285,7 \@\@\n",
" \n",
- " \tmsiof1: spi\@e6e10000 {\n",
+ " \tmsiof1: spi at e6e10000 {\n",
" \t\tcompatible = \"renesas,msiof-r8a7790\";\n",
"-\t\treg = <0 0xe6e10000 0 0x0064>, <0 0xe7e10000 0 0x0064>;\n",
"+\t\treg = <0 0xe6e10000 0 0x0064>;\n",
@@ -57,7 +57,7 @@
" \t\tdmas = <&dmac0 0x55>, <&dmac0 0x56>;\n",
"\@\@ -1297,7 +1297,7 \@\@\n",
" \n",
- " \tmsiof2: spi\@e6e00000 {\n",
+ " \tmsiof2: spi at e6e00000 {\n",
" \t\tcompatible = \"renesas,msiof-r8a7790\";\n",
"-\t\treg = <0 0xe6e00000 0 0x0064>, <0 0xe7e00000 0 0x0064>;\n",
"+\t\treg = <0 0xe6e00000 0 0x0064>;\n",
@@ -66,7 +66,7 @@
" \t\tdmas = <&dmac0 0x41>, <&dmac0 0x42>;\n",
"\@\@ -1309,7 +1309,7 \@\@\n",
" \n",
- " \tmsiof3: spi\@e6c90000 {\n",
+ " \tmsiof3: spi at e6c90000 {\n",
" \t\tcompatible = \"renesas,msiof-r8a7790\";\n",
"-\t\treg = <0 0xe6c90000 0 0x0064>, <0 0xe7c90000 0 0x0064>;\n",
"+\t\treg = <0 0xe6c90000 0 0x0064>;\n",
@@ -77,4 +77,4 @@
"2.1.4"
]
-b77616c83bb0431b170136d47b8ccfe0b3f6e5941c95d74d8564f689f365ab29
+4f0d81db8932a44672a131260d6bc0c3c4e9db1262e2a7abed5a57acdd137852
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.