diff for duplicates of <49756124.B9jeO4ArbL@wasted.cogentembedded.com>
diff --git a/a/1.txt b/N1/1.txt
index ffbc962..ad992a4 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -12,7 +12,8 @@ last week.
1 file changed, 12 insertions(+)
Index: renesas/arch/arm/boot/dts/r8a7794.dtsi
-=================================--- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi
+===================================================================
+--- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi
+++ renesas/arch/arm/boot/dts/r8a7794.dtsi
@@ -718,6 +718,18 @@
};
diff --git a/a/content_digest b/N1/content_digest
index a785120..e35c08a 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,10 +8,22 @@
"Subject\0[PATCH] ARM: shmobile: r8a7794: add HS-USB DT support\0"
]
[
- "Date\0Wed, 16 Sep 2015 23:53:58 +0000\0"
+ "Date\0Thu, 17 Sep 2015 02:53:58 +0300\0"
]
[
- "To\0linux-arm-kernel\@lists.infradead.org\0"
+ "To\0horms\@verge.net.au",
+ " linux-sh\@vger.kernel.org",
+ " robh+dt\@kernel.org",
+ " pawel.moll\@arm.com",
+ " mark.rutland\@arm.com",
+ " ijc+devicetree\@hellion.org.uk",
+ " galak\@codeaurora.org",
+ " devicetree\@vger.kernel.org\0"
+]
+[
+ "Cc\0magnus.damm\@gmail.com",
+ " linux\@arm.linux.org.uk",
+ " linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -34,7 +46,8 @@
" 1 file changed, 12 insertions(+)\n",
"\n",
"Index: renesas/arch/arm/boot/dts/r8a7794.dtsi\n",
- "=================================--- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi\n",
+ "===================================================================\n",
+ "--- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi\n",
"+++ renesas/arch/arm/boot/dts/r8a7794.dtsi\n",
"\@\@ -718,6 +718,18 \@\@\n",
" \t\t};\n",
@@ -57,4 +70,4 @@
" \t\treg = <0 0xe6590100 0 0x100>;"
]
-69bcc6bd627f3330a8915d8a6ea8d1475890d0dca4053d5cce9dd46b6a7a1b79
+7a4a7c58aaa69a3cb764eb7c20ef0d41eda50ba66a68897e8e5cfb6dbffbd34a
diff --git a/a/1.txt b/N2/1.txt
index ffbc962..443e7c4 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -12,13 +12,14 @@ last week.
1 file changed, 12 insertions(+)
Index: renesas/arch/arm/boot/dts/r8a7794.dtsi
-=================================--- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi
+===================================================================
+--- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi
+++ renesas/arch/arm/boot/dts/r8a7794.dtsi
@@ -718,6 +718,18 @@
};
};
-+ hsusb: usb@e6590000 {
++ hsusb: usb at e6590000 {
+ compatible = "renesas,usbhs-r8a7794";
+ reg = <0 0xe6590000 0 0x100>;
+ interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;
@@ -30,6 +31,6 @@ Index: renesas/arch/arm/boot/dts/r8a7794.dtsi
+ status = "disabled";
+ };
+
- usbphy: usb-phy@e6590100 {
+ usbphy: usb-phy at e6590100 {
compatible = "renesas,usb-phy-r8a7794";
reg = <0 0xe6590100 0 0x100>;
\ No newline at end of file
diff --git a/a/content_digest b/N2/content_digest
index a785120..7dd50cf 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,13 +2,13 @@
"ref\0001674850.BZpGW9kEud\@wasted.cogentembedded.com\0"
]
[
- "From\0Sergei Shtylyov <sergei.shtylyov\@cogentembedded.com>\0"
+ "From\0sergei.shtylyov\@cogentembedded.com (Sergei Shtylyov)\0"
]
[
"Subject\0[PATCH] ARM: shmobile: r8a7794: add HS-USB DT support\0"
]
[
- "Date\0Wed, 16 Sep 2015 23:53:58 +0000\0"
+ "Date\0Thu, 17 Sep 2015 02:53:58 +0300\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -34,13 +34,14 @@
" 1 file changed, 12 insertions(+)\n",
"\n",
"Index: renesas/arch/arm/boot/dts/r8a7794.dtsi\n",
- "=================================--- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi\n",
+ "===================================================================\n",
+ "--- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi\n",
"+++ renesas/arch/arm/boot/dts/r8a7794.dtsi\n",
"\@\@ -718,6 +718,18 \@\@\n",
" \t\t};\n",
" \t};\n",
" \n",
- "+\thsusb: usb\@e6590000 {\n",
+ "+\thsusb: usb at e6590000 {\n",
"+\t\tcompatible = \"renesas,usbhs-r8a7794\";\n",
"+\t\treg = <0 0xe6590000 0 0x100>;\n",
"+\t\tinterrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -52,9 +53,9 @@
"+\t\tstatus = \"disabled\";\n",
"+\t};\n",
"+\n",
- " \tusbphy: usb-phy\@e6590100 {\n",
+ " \tusbphy: usb-phy at e6590100 {\n",
" \t\tcompatible = \"renesas,usb-phy-r8a7794\";\n",
" \t\treg = <0 0xe6590100 0 0x100>;"
]
-69bcc6bd627f3330a8915d8a6ea8d1475890d0dca4053d5cce9dd46b6a7a1b79
+23c1fe2a89cc4f1652832c818657da345b97be0077029366bc050b5a9947eca4
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.