diff for duplicates of <1948350.BT8VM0CPFC@wasted.cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index f87b5d8..26ff11a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,7 +16,8 @@ Changes in version 2: 2 files changed, 21 insertions(+), 2 deletions(-) Index: renesas/arch/arm/boot/dts/r8a7790.dtsi -=================================--- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi +=================================================================== +--- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi +++ renesas/arch/arm/boot/dts/r8a7790.dtsi @@ -838,16 +838,34 @@ clock-output-names = "audio_clk_c"; @@ -41,7 +42,7 @@ Index: renesas/arch/arm/boot/dts/r8a7790.dtsi + }; + /* Special CPG clocks */ - cpg_clocks: cpg_clocks@e6150000 { + cpg_clocks: cpg_clocks at e6150000 { compatible = "renesas,r8a7790-cpg-clocks", "renesas,rcar-gen2-cpg-clocks"; reg = <0 0xe6150000 0 0x1000>; @@ -56,7 +57,8 @@ Index: renesas/arch/arm/boot/dts/r8a7790.dtsi /* Variable factor clocks */ Index: renesas/include/dt-bindings/clock/r8a7790-clock.h -=================================--- renesas.orig/include/dt-bindings/clock/r8a7790-clock.h +=================================================================== +--- renesas.orig/include/dt-bindings/clock/r8a7790-clock.h +++ renesas/include/dt-bindings/clock/r8a7790-clock.h @@ -21,6 +21,7 @@ #define R8A7790_CLK_SD0 7 diff --git a/a/content_digest b/N1/content_digest index adbb6ea..db269fc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\028994794.h3WeokSSG3@wasted.cogentembedded.com\0" - "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" + "From\0sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)\0" "Subject\0[PATCH v2 1/2] ARM: shmobile: r8a7790: add CAN clocks\0" - "Date\0Mon, 05 Jan 2015 21:33:25 +0000\0" + "Date\0Tue, 06 Jan 2015 00:33:25 +0300\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -23,7 +23,8 @@ " 2 files changed, 21 insertions(+), 2 deletions(-)\n" "\n" "Index: renesas/arch/arm/boot/dts/r8a7790.dtsi\n" - "=================================--- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi\n" + "===================================================================\n" + "--- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi\n" "+++ renesas/arch/arm/boot/dts/r8a7790.dtsi\n" "@@ -838,16 +838,34 @@\n" " \t\t\tclock-output-names = \"audio_clk_c\";\n" @@ -48,7 +49,7 @@ "+\t\t};\n" "+\n" " \t\t/* Special CPG clocks */\n" - " \t\tcpg_clocks: cpg_clocks@e6150000 {\n" + " \t\tcpg_clocks: cpg_clocks at e6150000 {\n" " \t\t\tcompatible = \"renesas,r8a7790-cpg-clocks\",\n" " \t\t\t\t \"renesas,rcar-gen2-cpg-clocks\";\n" " \t\t\treg = <0 0xe6150000 0 0x1000>;\n" @@ -63,7 +64,8 @@ " \n" " \t\t/* Variable factor clocks */\n" "Index: renesas/include/dt-bindings/clock/r8a7790-clock.h\n" - "=================================--- renesas.orig/include/dt-bindings/clock/r8a7790-clock.h\n" + "===================================================================\n" + "--- renesas.orig/include/dt-bindings/clock/r8a7790-clock.h\n" "+++ renesas/include/dt-bindings/clock/r8a7790-clock.h\n" "@@ -21,6 +21,7 @@\n" " #define R8A7790_CLK_SD0\t\t\t7\n" @@ -74,4 +76,4 @@ " /* MSTP0 */\n" " #define R8A7790_CLK_MSIOF0\t\t0" -cfd7cd6c3643762444853a391514272285c3e2931bafdc2a6fd3b71dcd57c46c +84f49dc9445cf54a95866b7da611ea64f7b74048d537dc928a94c144e5011bd5
diff --git a/a/1.txt b/N2/1.txt index f87b5d8..3e4de1e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -16,7 +16,8 @@ Changes in version 2: 2 files changed, 21 insertions(+), 2 deletions(-) Index: renesas/arch/arm/boot/dts/r8a7790.dtsi -=================================--- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi +=================================================================== +--- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi +++ renesas/arch/arm/boot/dts/r8a7790.dtsi @@ -838,16 +838,34 @@ clock-output-names = "audio_clk_c"; @@ -56,7 +57,8 @@ Index: renesas/arch/arm/boot/dts/r8a7790.dtsi /* Variable factor clocks */ Index: renesas/include/dt-bindings/clock/r8a7790-clock.h -=================================--- renesas.orig/include/dt-bindings/clock/r8a7790-clock.h +=================================================================== +--- renesas.orig/include/dt-bindings/clock/r8a7790-clock.h +++ renesas/include/dt-bindings/clock/r8a7790-clock.h @@ -21,6 +21,7 @@ #define R8A7790_CLK_SD0 7 diff --git a/a/content_digest b/N2/content_digest index adbb6ea..2b8bbd5 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,18 @@ "ref\028994794.h3WeokSSG3@wasted.cogentembedded.com\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0[PATCH v2 1/2] ARM: shmobile: r8a7790: add CAN clocks\0" - "Date\0Mon, 05 Jan 2015 21:33:25 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Tue, 06 Jan 2015 00:33:25 +0300\0" + "To\0horms@verge.net.au\0" + "Cc\0linux-sh@vger.kernel.org" + robh+dt@kernel.org + pawel.moll@arm.com + mark.rutland@arm.com + ijc+devicetree@hellion.org.uk + galak@codeaurora.org + devicetree@vger.kernel.org + magnus.damm@gmail.com + linux@arm.linux.org.uk + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "The R-Car CAN controllers can derive the CAN bus clock not only from their\n" @@ -23,7 +33,8 @@ " 2 files changed, 21 insertions(+), 2 deletions(-)\n" "\n" "Index: renesas/arch/arm/boot/dts/r8a7790.dtsi\n" - "=================================--- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi\n" + "===================================================================\n" + "--- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi\n" "+++ renesas/arch/arm/boot/dts/r8a7790.dtsi\n" "@@ -838,16 +838,34 @@\n" " \t\t\tclock-output-names = \"audio_clk_c\";\n" @@ -63,7 +74,8 @@ " \n" " \t\t/* Variable factor clocks */\n" "Index: renesas/include/dt-bindings/clock/r8a7790-clock.h\n" - "=================================--- renesas.orig/include/dt-bindings/clock/r8a7790-clock.h\n" + "===================================================================\n" + "--- renesas.orig/include/dt-bindings/clock/r8a7790-clock.h\n" "+++ renesas/include/dt-bindings/clock/r8a7790-clock.h\n" "@@ -21,6 +21,7 @@\n" " #define R8A7790_CLK_SD0\t\t\t7\n" @@ -74,4 +86,4 @@ " /* MSTP0 */\n" " #define R8A7790_CLK_MSIOF0\t\t0" -cfd7cd6c3643762444853a391514272285c3e2931bafdc2a6fd3b71dcd57c46c +df670ff4710fb17ac7f38495dac6c78fc500bd04a3329ea6f93fe39d1bab8743
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.