All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <560BC37C.2040306@cogentembedded.com>

diff --git a/a/1.txt b/N1/1.txt
index 060eeea..fc1ee2e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -12,13 +12,14 @@ On 9/30/2015 11:33 AM, Simon Horman wrote:
 >>>   1 file changed, 19 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
 >>> @@ -690,6 +690,25 @@
 >>>   				 0x1000 0 0 2 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;
 >>>   	};
 >>>
->>> +	usbphy: usb-phy@e6590100 {
+>>> +	usbphy: usb-phy at e6590100 {
 >>> +		compatible = "renesas,usb-phy-r8a7794";
 >>> +		reg = <0 0xe6590100 0 0x100>;
 >>> +		#address-cells = <1>;
diff --git a/a/content_digest b/N1/content_digest
index 5e54a4c..9453347 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,9 +2,9 @@
  "ref\01590842.9hQm6l1zli@wasted.cogentembedded.com\0"
  "ref\055F9F82E.4000809@cogentembedded.com\0"
  "ref\020150930083324.GA3426@verge.net.au\0"
- "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0"
- "Subject\0Re: [PATCH 1/2] ARM: shmobile: r8a7794: add USB PHY DT support\0"
- "Date\0Wed, 30 Sep 2015 11:11:56 +0000\0"
+ "From\0sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)\0"
+ "Subject\0[PATCH 1/2] ARM: shmobile: r8a7794: add USB PHY DT support\0"
+ "Date\0Wed, 30 Sep 2015 14:11:56 +0300\0"
  "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
@@ -22,13 +22,14 @@
  ">>>   1 file changed, 19 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"
  ">>> @@ -690,6 +690,25 @@\n"
  ">>>   \t\t\t\t 0x1000 0 0 2 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;\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>;\n"
  ">>> +\t\t#address-cells = <1>;\n"
@@ -44,4 +45,4 @@
  "\n"
  MBR, Sergei
 
-200d0ec2e14436148ca1d6f3cbdc9dac128f447c6692105c12166292c9928d04
+aa23130c12ead10d107a58b3418ad3b5b298bf4bc49a06b492670818fd3984a5

diff --git a/a/1.txt b/N2/1.txt
index 060eeea..5cbc196 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -12,7 +12,8 @@ On 9/30/2015 11:33 AM, Simon Horman wrote:
 >>>   1 file changed, 19 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
 >>> @@ -690,6 +690,25 @@
 >>>   				 0x1000 0 0 2 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/a/content_digest b/N2/content_digest
index 5e54a4c..bc0689b 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -4,8 +4,18 @@
  "ref\020150930083324.GA3426@verge.net.au\0"
  "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0"
  "Subject\0Re: [PATCH 1/2] ARM: shmobile: r8a7794: add USB PHY DT support\0"
- "Date\0Wed, 30 Sep 2015 11:11:56 +0000\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "Date\0Wed, 30 Sep 2015 14:11:56 +0300\0"
+ "To\0Simon Horman <horms@verge.net.au>\0"
+ "Cc\0linux-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
+  magnus.damm@gmail.com
+  linux@arm.linux.org.uk
+ " linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Hello.\n"
@@ -22,7 +32,8 @@
  ">>>   1 file changed, 19 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"
  ">>> @@ -690,6 +690,25 @@\n"
  ">>>   \t\t\t\t 0x1000 0 0 2 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;\n"
@@ -44,4 +55,4 @@
  "\n"
  MBR, Sergei
 
-200d0ec2e14436148ca1d6f3cbdc9dac128f447c6692105c12166292c9928d04
+dca800fad0efee53f6f37060d04b3e9c95c7930e89ccf8b447703e937030432f

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.