diff for duplicates of <308f306283894a0d3eeee7d1030289e4e668d49d.1403487225.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index e82b551..2e25eb3 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -23,11 +23,12 @@ index 8d7ffae..2c27e36 100644
- R8A7791_CLK_MMCIF0 R8A7791_CLK_IIC0 R8A7791_CLK_IIC1 R8A7791_CLK_CMT1
+ R8A7791_CLK_MMCIF0 R8A7791_CLK_IIC0 R8A7791_CLK_IIC1 R8A7791_CLK_SSUSB R8A7791_CLK_CMT1
>;
- clock-output-names "tpu0", "sdhi2", "sdhi1", "sdhi0",
+ clock-output-names =
+ "tpu0", "sdhi2", "sdhi1", "sdhi0",
- "mmcif0", "i2c7", "i2c8", "cmt1";
+ "mmcif0", "i2c7", "i2c8", "ssusb", "cmt1";
};
- mstp5_clks: mstp5_clks@e6150144 {
+ mstp5_clks: mstp5_clks at e6150144 {
compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
--
2.0.0.rc2
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index ba4247e..e1f9c07 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
"ref\0cover.1403487225.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 04/29] ARM: shmobile: r8a7791: add USB3.0 clocks to device tree\0"
]
[
- "Date\0Mon, 23 Jun 2014 02:28:13 +0000\0"
+ "Date\0Mon, 23 Jun 2014 11:28:13 +0900\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -45,14 +45,15 @@
"-\t\t\t\tR8A7791_CLK_MMCIF0 R8A7791_CLK_IIC0 R8A7791_CLK_IIC1 R8A7791_CLK_CMT1\n",
"+\t\t\t\tR8A7791_CLK_MMCIF0 R8A7791_CLK_IIC0 R8A7791_CLK_IIC1 R8A7791_CLK_SSUSB R8A7791_CLK_CMT1\n",
" \t\t\t>;\n",
- " \t\t\tclock-output-names \t\t\t\t\"tpu0\", \"sdhi2\", \"sdhi1\", \"sdhi0\",\n",
+ " \t\t\tclock-output-names =\n",
+ " \t\t\t\t\"tpu0\", \"sdhi2\", \"sdhi1\", \"sdhi0\",\n",
"-\t\t\t\t\"mmcif0\", \"i2c7\", \"i2c8\", \"cmt1\";\n",
"+\t\t\t\t\"mmcif0\", \"i2c7\", \"i2c8\", \"ssusb\", \"cmt1\";\n",
" \t\t};\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",
"-- \n",
"2.0.0.rc2"
]
-956f1f12566dad50dd5c41fea43d6d99e800fd6c82e393aae47a369e499cb465
+acf8c10ffccaf88b1dec041e798191d3051ba024f52e143ae5390812123c9bcf
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.