diff for duplicates of <538D71C1.3010900@renesas.com> diff --git a/a/1.txt b/N1/1.txt index 6bb5df6..fcab918 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,11 +19,12 @@ index ede8b7f..c2b5b38 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"; -- 1.7.9.5 diff --git a/a/content_digest b/N1/content_digest index 5bfc3e3..f51eda5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,6 @@ - "ref\01392633882-12142-1-git-send-email-wsa@the-dreams.de\0" - "From\0Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>\0" + "From\0yoshihiro.shimoda.uh@renesas.com (Yoshihiro Shimoda)\0" "Subject\0[PATCH v2 1/2] arm: shmobile: r8a7791: add USB3.0 clocks to device tree\0" - "Date\0Tue, 03 Jun 2014 06:57:05 +0000\0" + "Date\0Tue, 3 Jun 2014 15:57:05 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -26,13 +25,14 @@ "-\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" 1.7.9.5 -12e92a5697c8bbed7819ed296b6f82c9ce9c6958c0ed020ad85e78ab332b66c4 +a862618b5f621a6156c5a0ddb6e5199671a97928b9448e71cd4f9c492aff3107
diff --git a/a/1.txt b/N2/1.txt index 6bb5df6..7412b03 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -19,7 +19,8 @@ index ede8b7f..c2b5b38 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"; }; diff --git a/a/content_digest b/N2/content_digest index 5bfc3e3..749eef2 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,16 @@ - "ref\01392633882-12142-1-git-send-email-wsa@the-dreams.de\0" "From\0Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>\0" "Subject\0[PATCH v2 1/2] arm: shmobile: r8a7791: add USB3.0 clocks to device tree\0" - "Date\0Tue, 03 Jun 2014 06:57:05 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Tue, 3 Jun 2014 15:57:05 +0900\0" + "To\0Simon Horman <horms@verge.net.au>" + SH-Linux <linux-sh@vger.kernel.org> + Rob Herring <robh+dt@kernel.org> + pawel.moll@arm.com <pawel.moll@arm.com> + mark.rutland@arm.com <mark.rutland@arm.com> + ijc+devicetree@hellion.org.uk <ijc+devicetree@hellion.org.uk> + galak@codeaurora.org <galak@codeaurora.org> + " devicetree@vger.kernel.org <devicetree@vger.kernel.org>\0" + "Cc\0Magnus Damm <magnus.damm@gmail.com>" + " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" "\00:1\0" "b\0" "Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>\n" @@ -26,7 +34,8 @@ "-\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" @@ -35,4 +44,4 @@ "-- \n" 1.7.9.5 -12e92a5697c8bbed7819ed296b6f82c9ce9c6958c0ed020ad85e78ab332b66c4 +b9558e618e9dd0973ac4ea2621da17cc6a3e5ca70559d5e41f8c77261ad80121
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.