diff for duplicates of <f25d6b977240117eb4b6e3111f4eb41f968d28fb.1436509954.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index 48f54f6..08bec5d 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -18,7 +18,7 @@ index feb4652ed4b2..c9aae06319c0 100644
status = "disabled";
};
-+ avb: ethernet@e6800000 {
++ avb: ethernet at e6800000 {
+ compatible = "renesas,etheravb-r8a7790";
+ reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
+ interrupts = <0 163 IRQ_TYPE_LEVEL_HIGH>;
@@ -28,7 +28,7 @@ index feb4652ed4b2..c9aae06319c0 100644
+ status = "disabled";
+ };
+
- sata0: sata@ee300000 {
+ sata0: sata at ee300000 {
compatible = "renesas,sata-r8a7790";
reg = <0 0xee300000 0 0x2000>;
--
diff --git a/a/content_digest b/N1/content_digest
index 60dacc6..eb23886 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
"ref\0cover.1436509954.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/11] ARM: shmobile: r8a7790: add EtherAVB DT support\0"
]
[
- "Date\0Fri, 10 Jul 2015 06:37:12 +0000\0"
+ "Date\0Fri, 10 Jul 2015 15:37:12 +0900\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -40,7 +40,7 @@
" \t\tstatus = \"disabled\";\n",
" \t};\n",
" \n",
- "+\tavb: ethernet\@e6800000 {\n",
+ "+\tavb: ethernet at e6800000 {\n",
"+\t\tcompatible = \"renesas,etheravb-r8a7790\";\n",
"+\t\treg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;\n",
"+\t\tinterrupts = <0 163 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -50,11 +50,11 @@
"+\t\tstatus = \"disabled\";\n",
"+\t};\n",
"+\n",
- " \tsata0: sata\@ee300000 {\n",
+ " \tsata0: sata at ee300000 {\n",
" \t\tcompatible = \"renesas,sata-r8a7790\";\n",
" \t\treg = <0 0xee300000 0 0x2000>;\n",
"-- \n",
"2.1.4"
]
-06dd87d5e9b7adceb64fd76807dc0b7a7d73ccb9aeb211ed372052e68a2300df
+31b1d567189b4b8c9b8218d0015394a9efca252e86cd4f9e2bfcda7d301a99bc
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.