diff for duplicates of <4221957.7dd2kFrTHY@wasted.cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 17114a9..8c85758 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,10 +14,11 @@ The patch is against 'renesas-devel-20150108v2-v3.19-rc3' tag of Simon Horman's 1 file changed, 1 insertion(+), 1 deletion(-) Index: renesas/arch/arm/boot/dts/r8a7791.dtsi -=================================--- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi +=================================================================== +--- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi +++ renesas/arch/arm/boot/dts/r8a7791.dtsi @@ -1196,7 +1196,7 @@ - mstp8_clks: mstp8_clks@e6150990 { + mstp8_clks: mstp8_clks at e6150990 { compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; reg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>; - clocks = <&hp_clk>, <&zg_clk>, <&zg_clk>, <&zg_clk>, diff --git a/a/content_digest b/N1/content_digest index afbcf22..bf0e8b7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ - "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" + "From\0sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)\0" "Subject\0[PATCH] ARM: shmobile: r8a7791: fix MSTP8 input clocks\0" - "Date\0Mon, 12 Jan 2015 22:31:14 +0000\0" + "Date\0Tue, 13 Jan 2015 01:31:14 +0300\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -20,10 +20,11 @@ " 1 file changed, 1 insertion(+), 1 deletion(-)\n" "\n" "Index: renesas/arch/arm/boot/dts/r8a7791.dtsi\n" - "=================================--- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi\n" + "===================================================================\n" + "--- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi\n" "+++ renesas/arch/arm/boot/dts/r8a7791.dtsi\n" "@@ -1196,7 +1196,7 @@\n" - " \t\tmstp8_clks: mstp8_clks@e6150990 {\n" + " \t\tmstp8_clks: mstp8_clks at e6150990 {\n" " \t\t\tcompatible = \"renesas,r8a7791-mstp-clocks\", \"renesas,cpg-mstp-clocks\";\n" " \t\t\treg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>;\n" "-\t\t\tclocks = <&hp_clk>, <&zg_clk>, <&zg_clk>, <&zg_clk>,\n" @@ -32,4 +33,4 @@ " \t\t\t#clock-cells = <1>;\n" " \t\t\tclock-indices = <" -edaeb844e7b2246cfed346e717eda6358944fb23d1bc7c613f44f69c92b0f2de +dcf2b7371ccfd0b097ea8f40dabcc15e2431f34733aed1a9012018a4c7e1aa6f
diff --git a/a/1.txt b/N2/1.txt index 17114a9..fd2ef46 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -14,7 +14,8 @@ The patch is against 'renesas-devel-20150108v2-v3.19-rc3' tag of Simon Horman's 1 file changed, 1 insertion(+), 1 deletion(-) Index: renesas/arch/arm/boot/dts/r8a7791.dtsi -=================================--- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi +=================================================================== +--- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi +++ renesas/arch/arm/boot/dts/r8a7791.dtsi @@ -1196,7 +1196,7 @@ mstp8_clks: mstp8_clks@e6150990 { diff --git a/a/content_digest b/N2/content_digest index afbcf22..2050034 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,17 @@ "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0[PATCH] ARM: shmobile: r8a7791: fix MSTP8 input clocks\0" - "Date\0Mon, 12 Jan 2015 22:31:14 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Tue, 13 Jan 2015 01:31:14 +0300\0" + "To\0horms@verge.net.au" + linux-sh@vger.kernel.org + devicetree@vger.kernel.org + robh+dt@kernel.org + pawel.moll@arm.com + mark.rutland@arm.com + ijc+devicetree@hellion.org.uk + " galak@codeaurora.org\0" + "Cc\0magnus.damm@gmail.com" + linux@arm.linux.org.uk + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "I made a mistake when rebasing Andrey Gusakov's patch adding MLB+ clock to the\n" @@ -20,7 +30,8 @@ " 1 file changed, 1 insertion(+), 1 deletion(-)\n" "\n" "Index: renesas/arch/arm/boot/dts/r8a7791.dtsi\n" - "=================================--- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi\n" + "===================================================================\n" + "--- renesas.orig/arch/arm/boot/dts/r8a7791.dtsi\n" "+++ renesas/arch/arm/boot/dts/r8a7791.dtsi\n" "@@ -1196,7 +1196,7 @@\n" " \t\tmstp8_clks: mstp8_clks@e6150990 {\n" @@ -32,4 +43,4 @@ " \t\t\t#clock-cells = <1>;\n" " \t\t\tclock-indices = <" -edaeb844e7b2246cfed346e717eda6358944fb23d1bc7c613f44f69c92b0f2de +d1bec1caeedcb37f4b8daec86f7b790c8c4d7a0758a44760462ffc10e46974e5
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.