diff for duplicates of <ecafea8cd261833d7bb857aad76cf2e721821e88.1403487225.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index e2c1119..9f36a3c 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -27,12 +27,13 @@ index 29907c9..9df5712 100644
- R8A7790_CLK_IIC0 R8A7790_CLK_IIC1 R8A7790_CLK_SSUSB R8A7790_CLK_CMT1
+ R8A7790_CLK_IIC0 R8A7790_CLK_PCIEC R8A7790_CLK_IIC1 R8A7790_CLK_SSUSB R8A7790_CLK_CMT1
>;
- clock-output-names "iic2", "tpu0", "mmcif1", "sdhi3",
+ clock-output-names =
+ "iic2", "tpu0", "mmcif1", "sdhi3",
"sdhi2", "sdhi1", "sdhi0", "mmcif0",
- "iic0", "iic1", "ssusb", "cmt1";
+ "iic0", "pciec", "iic1", "ssusb", "cmt1";
};
- mstp5_clks: mstp5_clks@e6150144 {
+ mstp5_clks: mstp5_clks at e6150144 {
compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
diff --git a/include/dt-bindings/clock/r8a7790-clock.h b/include/dt-bindings/clock/r8a7790-clock.h
index a16df68..f929a79e 100644
diff --git a/a/content_digest b/N1/content_digest
index 985f4d9..08adc35 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 21/29] ARM: shmobile: r8a7790: Add PCIEC clock device tree node\0"
]
[
- "Date\0Mon, 23 Jun 2014 02:28:30 +0000\0"
+ "Date\0Mon, 23 Jun 2014 11:28:30 +0900\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -49,12 +49,13 @@
"-\t\t\t\tR8A7790_CLK_IIC0 R8A7790_CLK_IIC1 R8A7790_CLK_SSUSB R8A7790_CLK_CMT1\n",
"+\t\t\t\tR8A7790_CLK_IIC0 R8A7790_CLK_PCIEC R8A7790_CLK_IIC1 R8A7790_CLK_SSUSB R8A7790_CLK_CMT1\n",
" \t\t\t>;\n",
- " \t\t\tclock-output-names \t\t\t\t\"iic2\", \"tpu0\", \"mmcif1\", \"sdhi3\",\n",
+ " \t\t\tclock-output-names =\n",
+ " \t\t\t\t\"iic2\", \"tpu0\", \"mmcif1\", \"sdhi3\",\n",
" \t\t\t\t\"sdhi2\", \"sdhi1\", \"sdhi0\", \"mmcif0\",\n",
"-\t\t\t\t\"iic0\", \"iic1\", \"ssusb\", \"cmt1\";\n",
"+\t\t\t\t\"iic0\", \"pciec\", \"iic1\", \"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,r8a7790-mstp-clocks\", \"renesas,cpg-mstp-clocks\";\n",
"diff --git a/include/dt-bindings/clock/r8a7790-clock.h b/include/dt-bindings/clock/r8a7790-clock.h\n",
"index a16df68..f929a79e 100644\n",
@@ -72,4 +73,4 @@
"2.0.0.rc2"
]
-477868c310b1c11c9e38ffc838c0a895475d4babef91c28ad5e520f6b4b2ca5b
+945597cf678eca087e1bbbfa38fdba05308438cd1834a532377975c673d3cb92
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.