diff for duplicates of <7045264.74zTCWbb7p@wasted.cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 0eaf91d..0702a09 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,7 +11,8 @@ Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> 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"; @@ -36,7 +37,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>; @@ -51,7 +52,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 d092eaa..fcd6978 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\02616635.bsb7mLynhA@wasted.cogentembedded.com\0" - "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" + "From\0sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)\0" "Subject\0[PATCH 1/2] ARM: shmobile: r8a7790: add CAN clocks\0" - "Date\0Mon, 29 Dec 2014 22:04:49 +0000\0" + "Date\0Tue, 30 Dec 2014 01:04:49 +0300\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -18,7 +18,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" @@ -43,7 +44,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" @@ -58,7 +59,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" @@ -69,4 +71,4 @@ " /* MSTP0 */\n" " #define R8A7790_CLK_MSIOF0\t\t0" -18d564d9373b7e32fc9483e02b70912c778e794b0e94e9062c4e5d5f24db9bb9 +dee411db56d6b8700851681fc41232f8a6b07e10a4f74337d0779399452fe059
diff --git a/a/1.txt b/N2/1.txt index 0eaf91d..e7f73a0 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -11,7 +11,8 @@ Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> 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"; @@ -51,7 +52,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 d092eaa..8a1b1bd 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,18 @@ "ref\02616635.bsb7mLynhA@wasted.cogentembedded.com\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0[PATCH 1/2] ARM: shmobile: r8a7790: add CAN clocks\0" - "Date\0Mon, 29 Dec 2014 22:04:49 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Tue, 30 Dec 2014 01:04:49 +0300\0" + "To\0horms@verge.net.au" + linux-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\0" + "Cc\0magnus.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" @@ -18,7 +28,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" @@ -58,7 +69,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" @@ -69,4 +81,4 @@ " /* MSTP0 */\n" " #define R8A7790_CLK_MSIOF0\t\t0" -18d564d9373b7e32fc9483e02b70912c778e794b0e94e9062c4e5d5f24db9bb9 +6dcd087a88fee4cb54db6e13f9d0b024733507bee05c26fdf8a6f0d270c92502
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.