diff for duplicates of <8edae499162c30af16f0b8a77d394c19791ae372.1415059587.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index 290a852..22494dc 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -17,7 +17,7 @@ index c815313..8459fe6 100644
#gpio-range-cells = <3>;
};
-+ mmcif0: mmc@ee200000 {
++ mmcif0: mmc at ee200000 {
+ compatible = "renesas,mmcif-r8a7791", "renesas,sh-mmcif";
+ reg = <0 0xee200000 0 0x80>;
+ interrupts = <0 169 IRQ_TYPE_LEVEL_HIGH>;
@@ -26,7 +26,7 @@ index c815313..8459fe6 100644
+ status = "disabled";
+ };
+
- sdhi0: sd@ee100000 {
+ sdhi0: sd at ee100000 {
compatible = "renesas,sdhi-r8a7791";
reg = <0 0xee100000 0 0x200>;
--
diff --git a/a/content_digest b/N1/content_digest
index b99c782..221fe43 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
"ref\0cover.1415059587.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 31/34] ARM: shmobile: r8a7791: Add MMCIF0 DT node\0"
]
[
- "Date\0Tue, 04 Nov 2014 01:51:01 +0000\0"
+ "Date\0Tue, 4 Nov 2014 10:51:01 +0900\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -39,7 +39,7 @@
" \t\t#gpio-range-cells = <3>;\n",
" \t};\n",
" \n",
- "+\tmmcif0: mmc\@ee200000 {\n",
+ "+\tmmcif0: mmc at ee200000 {\n",
"+\t\tcompatible = \"renesas,mmcif-r8a7791\", \"renesas,sh-mmcif\";\n",
"+\t\treg = <0 0xee200000 0 0x80>;\n",
"+\t\tinterrupts = <0 169 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -48,11 +48,11 @@
"+\t\tstatus = \"disabled\";\n",
"+\t};\n",
"+\n",
- " \tsdhi0: sd\@ee100000 {\n",
+ " \tsdhi0: sd at ee100000 {\n",
" \t\tcompatible = \"renesas,sdhi-r8a7791\";\n",
" \t\treg = <0 0xee100000 0 0x200>;\n",
"-- \n",
"2.1.1"
]
-fd411ae18da5ce519dd168b7e8c7c2300cc66e10ec941befd90696d840cbc257
+f0ed4ba8f768625dd3c99fdbb013955150346e12f6f268f75f9a1f2cb0a62d61
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.