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

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

diff --git a/a/1.txt b/N1/1.txt
index 50f6854..1a3d688 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -15,9 +15,10 @@ index 6d95638..068ca09 100644
 --- a/arch/arm/boot/dts/r8a7794.dtsi
 +++ b/arch/arm/boot/dts/r8a7794.dtsi
 @@ -535,6 +535,14 @@
- 			clock-output-names  				"vin1", "vin0", "ether";
+ 			clock-output-names =
+ 				"vin1", "vin0", "ether";
  		};
-+		mstp9_clks: mstp9_clks@e6150994 {
++		mstp9_clks: mstp9_clks at e6150994 {
 +			compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
 +			reg = <0 0xe6150994 0 4>, <0 0xe61509a4 0 4>;
 +			clocks = <&cpg_clocks R8A7794_CLK_QSPI>;
@@ -25,7 +26,7 @@ index 6d95638..068ca09 100644
 +			clock-indices = <R8A7794_CLK_QSPI_MOD>;
 +			clock-output-names = "qspi_mod";
 +		};
- 		mstp11_clks: mstp11_clks@e615099c {
+ 		mstp11_clks: mstp11_clks at e615099c {
  			compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
  			reg = <0 0xe615099c 0 4>, <0 0xe61509ac 0 4>;
 diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h
diff --git a/a/content_digest b/N1/content_digest
index 4cb9507..d08901f 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 16/30] ARM: shmobile: r8a7794: Add QSPI clock to device tree\0"
 ]
 [
-  "Date\0Mon, 29 Dec 2014 01:43:47 +0000\0"
+  "Date\0Mon, 29 Dec 2014 10:43:47 +0900\0"
 ]
 [
   "To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -37,9 +37,10 @@
   "--- a/arch/arm/boot/dts/r8a7794.dtsi\n",
   "+++ b/arch/arm/boot/dts/r8a7794.dtsi\n",
   "\@\@ -535,6 +535,14 \@\@\n",
-  " \t\t\tclock-output-names  \t\t\t\t\"vin1\", \"vin0\", \"ether\";\n",
+  " \t\t\tclock-output-names =\n",
+  " \t\t\t\t\"vin1\", \"vin0\", \"ether\";\n",
   " \t\t};\n",
-  "+\t\tmstp9_clks: mstp9_clks\@e6150994 {\n",
+  "+\t\tmstp9_clks: mstp9_clks at e6150994 {\n",
   "+\t\t\tcompatible = \"renesas,r8a7794-mstp-clocks\", \"renesas,cpg-mstp-clocks\";\n",
   "+\t\t\treg = <0 0xe6150994 0 4>, <0 0xe61509a4 0 4>;\n",
   "+\t\t\tclocks = <&cpg_clocks R8A7794_CLK_QSPI>;\n",
@@ -47,7 +48,7 @@
   "+\t\t\tclock-indices = <R8A7794_CLK_QSPI_MOD>;\n",
   "+\t\t\tclock-output-names = \"qspi_mod\";\n",
   "+\t\t};\n",
-  " \t\tmstp11_clks: mstp11_clks\@e615099c {\n",
+  " \t\tmstp11_clks: mstp11_clks at e615099c {\n",
   " \t\t\tcompatible = \"renesas,r8a7794-mstp-clocks\", \"renesas,cpg-mstp-clocks\";\n",
   " \t\t\treg = <0 0xe615099c 0 4>, <0 0xe61509ac 0 4>;\n",
   "diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h\n",
@@ -66,4 +67,4 @@
   "2.1.3"
 ]
 
-5eaff0839b7281428f96904bb745e995841c08fc269f64628c886cbf3b9dab90
+88fb506a9750578b21d50a0627f9852c5e9aebd861ac01981da4d2803e5419b6
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.