diff for duplicates of <9065678.vTTCEInOk7@wasted.cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 4b6ec5a..091bc62 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,7 +27,8 @@ Changes in version 2: 2 files changed, 51 insertions(+), 2 deletions(-) Index: linux/Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks.txt -=================================--- linux.orig/Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks.txt +=================================================================== +--- linux.orig/Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks.txt +++ linux/Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks.txt @@ -17,7 +17,8 @@ Required Properties: to the USB_EXTAL clock @@ -47,7 +48,8 @@ Index: linux/Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clock + "rcan", "adsp"; }; Index: linux/drivers/clk/shmobile/clk-rcar-gen2.c -=================================--- linux.orig/drivers/clk/shmobile/clk-rcar-gen2.c +=================================================================== +--- linux.orig/drivers/clk/shmobile/clk-rcar-gen2.c +++ linux/drivers/clk/shmobile/clk-rcar-gen2.c @@ -33,6 +33,7 @@ struct rcar_gen2_cpg { #define CPG_FRQCRC 0x000000e0 diff --git a/a/content_digest b/N1/content_digest index aaa7475..b1e48ea 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,6 @@ - "ref\030876083.4tlAgq9Aak@wasted.cogentembedded.com\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0[PATCH v2] clk-rcar-gen2: ADSP clock support\0" - "Date\0Tue, 06 Jan 2015 22:38:47 +0000\0" + "Date\0Wed, 07 Jan 2015 01:38:47 +0300\0" "To\0mturquette@linaro.org" linux-kernel@vger.kernel.org " sboyd@codeaurora.org\0" @@ -42,7 +41,8 @@ " 2 files changed, 51 insertions(+), 2 deletions(-)\n" "\n" "Index: linux/Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks.txt\n" - "=================================--- linux.orig/Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks.txt\n" + "===================================================================\n" + "--- linux.orig/Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks.txt\n" "+++ linux/Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks.txt\n" "@@ -17,7 +17,8 @@ Required Properties:\n" " to the USB_EXTAL clock\n" @@ -62,7 +62,8 @@ "+\t\t\t\t \"rcan\", \"adsp\";\n" " \t};\n" "Index: linux/drivers/clk/shmobile/clk-rcar-gen2.c\n" - "=================================--- linux.orig/drivers/clk/shmobile/clk-rcar-gen2.c\n" + "===================================================================\n" + "--- linux.orig/drivers/clk/shmobile/clk-rcar-gen2.c\n" "+++ linux/drivers/clk/shmobile/clk-rcar-gen2.c\n" "@@ -33,6 +33,7 @@ struct rcar_gen2_cpg {\n" " #define CPG_FRQCRC\t\t\t0x000000e0\n" @@ -134,4 +135,4 @@ " \t\treturn ERR_PTR(-EINVAL);\n" " \t}" -96df383fb933fca01817bb9fd91455fec679d144310c87c659677a9d7de1ba7e +29ab4384ca7edddba144816216d1121033ed4de2b3a2f804d20d493bd2bf8517
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.