diff for duplicates of <ae65a8ae4c25c7ea01204c9d033cd47da3000cf8.1424849129.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index bc0cd5c..b6788b6 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -27,7 +27,7 @@ index ff49b95..1e593a2 100644
/* Variable factor clocks */
@@ -1164,13 +1164,16 @@
- mstp5_clks: mstp5_clks@e6150144 {
+ mstp5_clks: mstp5_clks at e6150144 {
compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
reg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>;
- clocks = <&hp_clk>, <&hp_clk>, <&extal_clk>, <&p_clk>;
@@ -44,7 +44,7 @@ index ff49b95..1e593a2 100644
+ clock-output-names = "audmac0", "audmac1", "adsp_mod",
+ "thermal", "pwm";
};
- mstp7_clks: mstp7_clks@e615014c {
+ mstp7_clks: mstp7_clks at e615014c {
compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h
index a45a363..8fc5dc8 100644
diff --git a/a/content_digest b/N1/content_digest
index ed2753e..81eff63 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
"ref\0cover.1424849129.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 30/32] ARM: shmobile: r8a7791: add ADSP clocks\0"
]
[
- "Date\0Thu, 26 Feb 2015 06:21:27 +0000\0"
+ "Date\0Thu, 26 Feb 2015 15:21:27 +0900\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -49,7 +49,7 @@
" \n",
" \t\t/* Variable factor clocks */\n",
"\@\@ -1164,13 +1164,16 \@\@\n",
- " \t\tmstp5_clks: mstp5_clks\@e6150144 {\n",
+ " \t\tmstp5_clks: mstp5_clks at e6150144 {\n",
" \t\t\tcompatible = \"renesas,r8a7791-mstp-clocks\", \"renesas,cpg-mstp-clocks\";\n",
" \t\t\treg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>;\n",
"-\t\t\tclocks = <&hp_clk>, <&hp_clk>, <&extal_clk>, <&p_clk>;\n",
@@ -66,7 +66,7 @@
"+\t\t\tclock-output-names = \"audmac0\", \"audmac1\", \"adsp_mod\",\n",
"+\t\t\t\t\t \"thermal\", \"pwm\";\n",
" \t\t};\n",
- " \t\tmstp7_clks: mstp7_clks\@e615014c {\n",
+ " \t\tmstp7_clks: mstp7_clks at e615014c {\n",
" \t\t\tcompatible = \"renesas,r8a7791-mstp-clocks\", \"renesas,cpg-mstp-clocks\";\n",
"diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h\n",
"index a45a363..8fc5dc8 100644\n",
@@ -92,4 +92,4 @@
"2.1.4"
]
-0fc7b4a0a20b04a1fcfdcc674b31a8265407364f2a14dff7fdbc2f4fbce84493
+b6f4f9d5efb5dccac7f80488fdeb760aacf8673b076f6ceed01e41a0fc74950b
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.