All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <22a9b44fc17e83417fa890123a33164ea37fc10c.1419812186.git.horms+renesas@verge.net.au>

diff --git a/a/1.txt b/N1/1.txt
index 4ba0b1b..21361f5 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -14,7 +14,7 @@ index e537654..13e4a8d 100644
 --- a/arch/arm/boot/dts/r8a7794.dtsi
 +++ b/arch/arm/boot/dts/r8a7794.dtsi
 @@ -493,13 +493,14 @@
- 		mstp3_clks: mstp3_clks@e615013c {
+ 		mstp3_clks: mstp3_clks at e615013c {
  			compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
  			reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>;
 -			clocks = <&rclk_clk>;
@@ -25,10 +25,11 @@ index e537654..13e4a8d 100644
 +				R8A7794_CLK_CMT1 R8A7794_CLK_USBDMAC0
 +				R8A7794_CLK_USBDMAC1
  			>;
- 			clock-output-names -				"cmt1";
+ 			clock-output-names =
+-				"cmt1";
 +				"cmt1", "usbdmac0", "usbdmac1";
  		};
- 		mstp7_clks: mstp7_clks@e615014c {
+ 		mstp7_clks: mstp7_clks at e615014c {
  			compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
 diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h
 index 94e2bbf..52492d8 100644
diff --git a/a/content_digest b/N1/content_digest
index 1d757af..3abfefa 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
   "ref\0cover.1419812185.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 11/30] ARM: shmobile: r8a7794: Add USBDMAC[01] clocks to device tree\0"
 ]
 [
-  "Date\0Mon, 29 Dec 2014 01:43:42 +0000\0"
+  "Date\0Mon, 29 Dec 2014 10:43:42 +0900\0"
 ]
 [
   "To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -36,7 +36,7 @@
   "--- a/arch/arm/boot/dts/r8a7794.dtsi\n",
   "+++ b/arch/arm/boot/dts/r8a7794.dtsi\n",
   "\@\@ -493,13 +493,14 \@\@\n",
-  " \t\tmstp3_clks: mstp3_clks\@e615013c {\n",
+  " \t\tmstp3_clks: mstp3_clks at e615013c {\n",
   " \t\t\tcompatible = \"renesas,r8a7794-mstp-clocks\", \"renesas,cpg-mstp-clocks\";\n",
   " \t\t\treg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>;\n",
   "-\t\t\tclocks = <&rclk_clk>;\n",
@@ -47,10 +47,11 @@
   "+\t\t\t\tR8A7794_CLK_CMT1 R8A7794_CLK_USBDMAC0\n",
   "+\t\t\t\tR8A7794_CLK_USBDMAC1\n",
   " \t\t\t>;\n",
-  " \t\t\tclock-output-names -\t\t\t\t\"cmt1\";\n",
+  " \t\t\tclock-output-names =\n",
+  "-\t\t\t\t\"cmt1\";\n",
   "+\t\t\t\t\"cmt1\", \"usbdmac0\", \"usbdmac1\";\n",
   " \t\t};\n",
-  " \t\tmstp7_clks: mstp7_clks\@e615014c {\n",
+  " \t\tmstp7_clks: mstp7_clks at e615014c {\n",
   " \t\t\tcompatible = \"renesas,r8a7794-mstp-clocks\", \"renesas,cpg-mstp-clocks\";\n",
   "diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h\n",
   "index 94e2bbf..52492d8 100644\n",
@@ -69,4 +70,4 @@
   "2.1.3"
 ]
 
-379bd04cb595d17c80b42a7e128320852b7c82172ed0f2361d982eb0aaa72cf4
+f99e8c2c9b56f2913bdf93d1872f3dba16f0119b0bbe33fd5dc13dd9b9d836e7
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.