diff for duplicates of <1507846.mqylbqQs2V@avalon> diff --git a/a/1.txt b/N1/1.txt index d3623b4..a5c8566 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -39,12 +39,13 @@ clocks"; > > >; > -> 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,r8a7791-mstp-clocks", "renesas,cpg-mstp- clocks"; diff --git a/a/content_digest b/N1/content_digest index 0f8b999..0797908 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01401716531-29794-1-git-send-email-geert+renesas@glider.be\0" "ref\01401716531-29794-4-git-send-email-geert+renesas@glider.be\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH v2 3/7] ARM: shmobile: r8a7791 dtsi: add SYS-DMAC clocks\0" - "Date\0Wed, 04 Jun 2014 11:24:57 +0000\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH v2 3/7] ARM: shmobile: r8a7791 dtsi: add SYS-DMAC clocks\0" + "Date\0Wed, 04 Jun 2014 13:24:57 +0200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -47,12 +47,13 @@ "> \n" "> \t\t\t>;\n" "> \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,r8a7791-mstp-clocks\", \"renesas,cpg-mstp-\n" "clocks\";\n" "\n" @@ -61,4 +62,4 @@ "\n" Laurent Pinchart -3333d336bb2e143f97f358e4dfab7bba51b905f8039b1d3dbab7ff21cab268f7 +d651d52eaa2dd86c77783627a0d735850a38e2b5bb19830f3cd6bbdd9ce184dd
diff --git a/a/1.txt b/N2/1.txt index d3623b4..da6124b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -39,7 +39,8 @@ clocks"; > > >; > -> 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"; diff --git a/a/content_digest b/N2/content_digest index 0f8b999..6fc5d58 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,8 +2,15 @@ "ref\01401716531-29794-4-git-send-email-geert+renesas@glider.be\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH v2 3/7] ARM: shmobile: r8a7791 dtsi: add SYS-DMAC clocks\0" - "Date\0Wed, 04 Jun 2014 11:24:57 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Wed, 04 Jun 2014 13:24:57 +0200\0" + "To\0Geert Uytterhoeven <geert+renesas@glider.be>\0" + "Cc\0Simon Horman <horms@verge.net.au>" + Magnus Damm <magnus.damm@gmail.com> + Ben Dooks <ben.dooks@codethink.co.uk> + linux-sh@vger.kernel.org + linux-arm-kernel@lists.infradead.org + devicetree@vger.kernel.org + " dmaengine@vger.kernel.org\0" "\00:1\0" "b\0" "Hi Geert,\n" @@ -47,7 +54,8 @@ "> \n" "> \t\t\t>;\n" "> \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" @@ -61,4 +69,4 @@ "\n" Laurent Pinchart -3333d336bb2e143f97f358e4dfab7bba51b905f8039b1d3dbab7ff21cab268f7 +165b7c5b64f3240084087a704fea0bc697943526cf1701bf4c52e406e24741c7
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.