diff for duplicates of <20180822204307.13251-13-lkundrak@v3.sk>
diff --git a/a/1.txt b/N1/1.txt
index aa4ac83..dca6d1f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -32,6 +32,4 @@ index 000000000000..335589895763
+ clock-names = "USBCLK";
+ phys = <&usb_otg_phy>;
+ phy-names = "usb";
-+ };
---
-2.17.1
\ No newline at end of file
++ };
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 9760ee6..a6b8815 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,11 +1,8 @@
-[
- "ref\00020180822204307.13251-1-lkundrak\@v3.sk\0"
-]
[
"From\0Lubomir Rintel <lkundrak\@v3.sk>\0"
]
[
- "Subject\0[PATCH 12/14] dt-bindings: ehci-mv: add bindings\0"
+ "Subject\0[12/14] dt-bindings: ehci-mv: add bindings\0"
]
[
"Date\0Wed, 22 Aug 2018 22:43:05 +0200\0"
@@ -66,9 +63,7 @@
"+\t\tclock-names = \"USBCLK\";\n",
"+\t\tphys = <&usb_otg_phy>;\n",
"+\t\tphy-names = \"usb\";\n",
- "+\t};\n",
- "-- \n",
- "2.17.1"
+ "+\t};"
]
-b636ebc2fdaf135f38f7561a9d7bd87215163501335763cfbf22dea3e4e6c025
+176b7c98cda1ff329820a82d771ba2749b0fbe7c4b63c7306c1debc9924c9252
diff --git a/a/1.txt b/N2/1.txt
index aa4ac83..f65de92 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -24,7 +24,7 @@ index 000000000000..335589895763
+
+Example:
+
-+ ehci0: usb-ehci@d4208000 {
++ ehci0: usb-ehci at d4208000 {
+ compatible = "marvell,pxau2o-ehci";
+ reg = <0xd4208000 0x200>;
+ interrupts = <44>;
diff --git a/a/content_digest b/N2/content_digest
index 9760ee6..2538bc2 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\00020180822204307.13251-1-lkundrak\@v3.sk\0"
]
[
- "From\0Lubomir Rintel <lkundrak\@v3.sk>\0"
+ "From\0lkundrak\@v3.sk (Lubomir Rintel)\0"
]
[
"Subject\0[PATCH 12/14] dt-bindings: ehci-mv: add bindings\0"
@@ -11,19 +11,7 @@
"Date\0Wed, 22 Aug 2018 22:43:05 +0200\0"
]
[
- "To\0linux-kernel\@vger.kernel.org\0"
-]
-[
- "Cc\0linux-usb\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org",
- " Rob Herring <robh+dt\@kernel.org>",
- " Mark Rutland <mark.rutland\@arm.com>",
- " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
- " Eric Miao <eric.y.miao\@gmail.com>",
- " Haojian Zhuang <haojian.zhuang\@gmail.com>",
- " Kishon Vijay Abraham I <kishon\@ti.com>",
- " Alan Stern <stern\@rowland.harvard.edu>",
- " Lubomir Rintel <lkundrak\@v3.sk>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -58,7 +46,7 @@
"+\n",
"+Example:\n",
"+\n",
- "+\tehci0: usb-ehci\@d4208000 {\n",
+ "+\tehci0: usb-ehci at d4208000 {\n",
"+\t\tcompatible = \"marvell,pxau2o-ehci\";\n",
"+\t\treg = <0xd4208000 0x200>;\n",
"+\t\tinterrupts = <44>;\n",
@@ -71,4 +59,4 @@
"2.17.1"
]
-b636ebc2fdaf135f38f7561a9d7bd87215163501335763cfbf22dea3e4e6c025
+d11043434d221cfd574b9b5aacedf04dc229ae76f75d37ccd96962e75590af5c
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.