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

diff for duplicates of <61624caf2479732beb42ea88a6b6ca3c7ae59cd7.1431565427.git.horms+renesas@verge.net.au>

diff --git a/a/1.txt b/N1/1.txt
index 3c3743a..3daf3f0 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -21,12 +21,12 @@ index f3b8430070b6..22e73906ec88 100644
 +		clocks = <&mstp4_clks R8A7790_CLK_IRQC>;
  	};
  
- 	dmac0: dma-controller@e6700000 {
+ 	dmac0: dma-controller at e6700000 {
 @@ -1158,6 +1159,14 @@
  				"iic0", "pciec", "iic1", "ssusb", "cmt1",
  				"usbdmac0", "usbdmac1";
  		};
-+		mstp4_clks: mstp4_clks@e6150140 {
++		mstp4_clks: mstp4_clks at e6150140 {
 +			compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
 +			reg = <0 0xe6150140 0 4>, <0 0xe615004c 0 4>;
 +			clocks = <&cp_clk>;
@@ -34,7 +34,7 @@ index f3b8430070b6..22e73906ec88 100644
 +			clock-indices = <R8A7790_CLK_IRQC>;
 +			clock-output-names = "irqc";
 +		};
- 		mstp5_clks: mstp5_clks@e6150144 {
+ 		mstp5_clks: mstp5_clks at e6150144 {
  			compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
  			reg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>;
 diff --git a/include/dt-bindings/clock/r8a7790-clock.h b/include/dt-bindings/clock/r8a7790-clock.h
diff --git a/a/content_digest b/N1/content_digest
index ff04c3d..cfe0bb9 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
   "ref\0cover.1431565427.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 06/31] ARM: shmobile: r8a7790: Add IRQC clock to device tree\0"
 ]
 [
-  "Date\0Thu, 14 May 2015 01:06:35 +0000\0"
+  "Date\0Thu, 14 May 2015 10:06:35 +0900\0"
 ]
 [
   "To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -43,12 +43,12 @@
   "+\t\tclocks = <&mstp4_clks R8A7790_CLK_IRQC>;\n",
   " \t};\n",
   " \n",
-  " \tdmac0: dma-controller\@e6700000 {\n",
+  " \tdmac0: dma-controller at e6700000 {\n",
   "\@\@ -1158,6 +1159,14 \@\@\n",
   " \t\t\t\t\"iic0\", \"pciec\", \"iic1\", \"ssusb\", \"cmt1\",\n",
   " \t\t\t\t\"usbdmac0\", \"usbdmac1\";\n",
   " \t\t};\n",
-  "+\t\tmstp4_clks: mstp4_clks\@e6150140 {\n",
+  "+\t\tmstp4_clks: mstp4_clks at e6150140 {\n",
   "+\t\t\tcompatible = \"renesas,r8a7790-mstp-clocks\", \"renesas,cpg-mstp-clocks\";\n",
   "+\t\t\treg = <0 0xe6150140 0 4>, <0 0xe615004c 0 4>;\n",
   "+\t\t\tclocks = <&cp_clk>;\n",
@@ -56,7 +56,7 @@
   "+\t\t\tclock-indices = <R8A7790_CLK_IRQC>;\n",
   "+\t\t\tclock-output-names = \"irqc\";\n",
   "+\t\t};\n",
-  " \t\tmstp5_clks: mstp5_clks\@e6150144 {\n",
+  " \t\tmstp5_clks: mstp5_clks at e6150144 {\n",
   " \t\t\tcompatible = \"renesas,r8a7790-mstp-clocks\", \"renesas,cpg-mstp-clocks\";\n",
   " \t\t\treg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>;\n",
   "diff --git a/include/dt-bindings/clock/r8a7790-clock.h b/include/dt-bindings/clock/r8a7790-clock.h\n",
@@ -77,4 +77,4 @@
   "2.1.4"
 ]
 
-1fb9848716ffe9263d384e5190f9c640380d25e26ed1824c3aac13e3a6e5d051
+682d878a7fe8f5689a3e4acca1078dd26138128fdae75bd6b538e304f09fd1f6
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.