diff for duplicates of <be16cd385c08dce7efa406704b5aa420ef6d1992.1419812186.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index 34602d7..6619a41 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -27,12 +27,13 @@ index 13e4a8d..6d95638 100644
R8A7794_CLK_MSIOF1 R8A7794_CLK_SCIFB2
+ R8A7794_CLK_SYS_DMAC1 R8A7794_CLK_SYS_DMAC0
>;
- clock-output-names "scifa2", "scifa1", "scifa0", "msiof2", "scifb0",
+ clock-output-names =
+ "scifa2", "scifa1", "scifa0", "msiof2", "scifb0",
- "scifb1", "msiof1", "scifb2";
+ "scifb1", "msiof1", "scifb2",
+ "sys-dmac1", "sys-dmac0";
};
- mstp3_clks: mstp3_clks@e615013c {
+ mstp3_clks: mstp3_clks at e615013c {
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 52492d8..c0bd14a5 100644
diff --git a/a/content_digest b/N1/content_digest
index 2fbfeba..426d4a3 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 14/30] ARM: shmobile: r8a7794: Add SYS-DMAC clocks to device tree\0"
]
[
- "Date\0Mon, 29 Dec 2014 01:43:45 +0000\0"
+ "Date\0Mon, 29 Dec 2014 10:43:45 +0900\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -49,12 +49,13 @@
" \t\t\t\tR8A7794_CLK_MSIOF1 R8A7794_CLK_SCIFB2\n",
"+\t\t\t\tR8A7794_CLK_SYS_DMAC1 R8A7794_CLK_SYS_DMAC0\n",
" \t\t\t>;\n",
- " \t\t\tclock-output-names \t\t\t\t\"scifa2\", \"scifa1\", \"scifa0\", \"msiof2\", \"scifb0\",\n",
+ " \t\t\tclock-output-names =\n",
+ " \t\t\t\t\"scifa2\", \"scifa1\", \"scifa0\", \"msiof2\", \"scifb0\",\n",
"-\t\t\t\t\"scifb1\", \"msiof1\", \"scifb2\";\n",
"+\t\t\t\t\"scifb1\", \"msiof1\", \"scifb2\",\n",
"+\t\t\t\t\"sys-dmac1\", \"sys-dmac0\";\n",
" \t\t};\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",
"diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h\n",
"index 52492d8..c0bd14a5 100644\n",
@@ -73,4 +74,4 @@
"2.1.3"
]
-f06a0a78604572e9c3032ff6fd7a90075d9f98d789d000c5a2bfb0fe7a80c586
+2c82812ac51503f629de72668e9d4035807ce8c223fb52bcda00648413388422
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.