diff for duplicates of <1550804.XpyQtHjy2T@avalon> diff --git a/a/1.txt b/N1/1.txt index b68c2fb..d471e84 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -35,7 +35,7 @@ clk-rcar-gen2: ADSP clock support". > > Index: > linux/Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks. -> txt ================================== --- +> txt =================================================================== --- > linux.orig/Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-cl > ocks.txt +++ > linux/Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks. @@ -60,7 +60,8 @@ clk-rcar-gen2: ADSP clock support". > + "rcan"; > }; > 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 3c56782..7e2fab9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\03007073.i0ghnTEhxV@wasted.cogentembedded.com\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH v2] clk-rcar-gen2: RCAN clock support\0" - "Date\0Mon, 05 Jan 2015 08:53:02 +0000\0" + "Date\0Mon, 05 Jan 2015 10:53:02 +0200\0" "To\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Cc\0mturquette@linaro.org" linux-kernel@vger.kernel.org @@ -52,7 +52,7 @@ "> \n" "> Index:\n" "> linux/Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks.\n" - "> txt ================================== ---\n" + "> txt =================================================================== ---\n" "> linux.orig/Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-cl\n" "> ocks.txt +++\n" "> linux/Documentation/devicetree/bindings/clock/renesas,rcar-gen2-cpg-clocks.\n" @@ -77,7 +77,8 @@ "> +\t\t\t\t \"rcan\";\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" @@ -148,4 +149,4 @@ "\n" Laurent Pinchart -923ab0c18b860e767b479c42e3423a57e8c5e8505e8ffaa1136d5b4d21b77dea +81c3591a052f54e0f4702f8b8ef358537b7a19798f77478502d2c6009df179df
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.