diff for duplicates of <9859cd3b1582cbe39f969a500d8b7fc87c4b87b8.1447981420.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index d0e8f89..951d5a3 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -31,12 +31,13 @@ index 018ff56470b6..b70e4061d8b1 100644
- R8A7794_CLK_SCIF0
+ R8A7794_CLK_SCIF0 R8A7794_CLK_DU0
>;
- clock-output-names "ehci", "hsusb",
+ clock-output-names =
+ "ehci", "hsusb",
"hscif2", "scif5", "scif4", "hscif1", "hscif0",
- "scif3", "scif2", "scif1", "scif0";
+ "scif3", "scif2", "scif1", "scif0", "du0";
};
- mstp8_clks: mstp8_clks@e6150990 {
+ mstp8_clks: mstp8_clks at e6150990 {
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 09da38a58776..a7a7e0370968 100644
diff --git a/a/content_digest b/N1/content_digest
index 92f5c28..61b0102 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
"ref\0cover.1447981420.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 19/29] ARM: shmobile: r8a7794: Add DU0 clock\0"
]
[
- "Date\0Fri, 20 Nov 2015 01:05:26 +0000\0"
+ "Date\0Thu, 19 Nov 2015 17:05:26 -0800\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -53,12 +53,13 @@
"-\t\t\t\tR8A7794_CLK_SCIF0\n",
"+\t\t\t\tR8A7794_CLK_SCIF0 R8A7794_CLK_DU0\n",
" \t\t\t>;\n",
- " \t\t\tclock-output-names \t\t\t\t\"ehci\", \"hsusb\",\n",
+ " \t\t\tclock-output-names =\n",
+ " \t\t\t\t\"ehci\", \"hsusb\",\n",
" \t\t\t\t\"hscif2\", \"scif5\", \"scif4\", \"hscif1\", \"hscif0\",\n",
"-\t\t\t\t\"scif3\", \"scif2\", \"scif1\", \"scif0\";\n",
"+\t\t\t\t\"scif3\", \"scif2\", \"scif1\", \"scif0\", \"du0\";\n",
" \t\t};\n",
- " \t\tmstp8_clks: mstp8_clks\@e6150990 {\n",
+ " \t\tmstp8_clks: mstp8_clks at e6150990 {\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 09da38a58776..a7a7e0370968 100644\n",
@@ -76,4 +77,4 @@
"2.1.4"
]
-bdf91a7df83df1b6d2225cb364efe1de67030d9bd0041ad740292de2e844d290
+9bf7a2592a138f34d5297dba657fe423d187e4b4c077d441dabff2a712e0393f
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.