diff for duplicates of <20130530185732.4470.91176@quantum> diff --git a/a/1.txt b/N1/1.txt index a5c10a2..381790e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,11 +1,9 @@ Quoting Yuantian.Tang@freescale.com (2013-05-22 01:22:19) > From: Tang Yuantian <yuantian.tang@freescale.com> -> = - +> > The compatible string of clock is changed from *-2 to *-2.0 > on chassis 2. So updated it accordingly. -> = - +> > Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com> Taken into clk-next. @@ -16,24 +14,19 @@ Mike > --- > drivers/clk/clk-ppc-corenet.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) -> = - +> > diff --git a/drivers/clk/clk-ppc-corenet.c b/drivers/clk/clk-ppc-corenet.c > index a2d483f..e958707 100644 > --- a/drivers/clk/clk-ppc-corenet.c > +++ b/drivers/clk/clk-ppc-corenet.c -> @@ -260,7 +260,7 @@ static int __init ppc_corenet_clk_probe(struct platfo= -rm_device *pdev) -> = - -> static const struct of_device_id ppc_clk_ids[] __initconst =3D { -> { .compatible =3D "fsl,qoriq-clockgen-1.0", }, -> - { .compatible =3D "fsl,qoriq-clockgen-2", }, -> + { .compatible =3D "fsl,qoriq-clockgen-2.0", }, +> @@ -260,7 +260,7 @@ static int __init ppc_corenet_clk_probe(struct platform_device *pdev) +> +> static const struct of_device_id ppc_clk_ids[] __initconst = { +> { .compatible = "fsl,qoriq-clockgen-1.0", }, +> - { .compatible = "fsl,qoriq-clockgen-2", }, +> + { .compatible = "fsl,qoriq-clockgen-2.0", }, > {} > }; -> = - -> -- = - +> +> -- > 1.8.0 diff --git a/a/content_digest b/N1/content_digest index 3ff5980..dd2232a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,8 +2,6 @@ "From\0Mike Turquette <mturquette@linaro.org>\0" "Subject\0Re: [PATCH] clk/mpc85xx: Update the compatible string\0" "Date\0Thu, 30 May 2013 11:57:32 -0700\0" - "To\0<Yuantian.Tang@freescale.com>" - "\0" "Cc\0Tang Yuantian <Yuantian.Tang@freescale.com>" devicetree-discuss@lists.ozlabs.org " linuxppc-dev@lists.ozlabs.org\0" @@ -11,12 +9,10 @@ "b\0" "Quoting Yuantian.Tang@freescale.com (2013-05-22 01:22:19)\n" "> From: Tang Yuantian <yuantian.tang@freescale.com>\n" - "> =\n" - "\n" + "> \n" "> The compatible string of clock is changed from *-2 to *-2.0\n" "> on chassis 2. So updated it accordingly.\n" - "> =\n" - "\n" + "> \n" "> Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com>\n" "\n" "Taken into clk-next.\n" @@ -27,26 +23,21 @@ "> ---\n" "> drivers/clk/clk-ppc-corenet.c | 2 +-\n" "> 1 file changed, 1 insertion(+), 1 deletion(-)\n" - "> =\n" - "\n" + "> \n" "> diff --git a/drivers/clk/clk-ppc-corenet.c b/drivers/clk/clk-ppc-corenet.c\n" "> index a2d483f..e958707 100644\n" "> --- a/drivers/clk/clk-ppc-corenet.c\n" "> +++ b/drivers/clk/clk-ppc-corenet.c\n" - "> @@ -260,7 +260,7 @@ static int __init ppc_corenet_clk_probe(struct platfo=\n" - "rm_device *pdev)\n" - "> =\n" - "\n" - "> static const struct of_device_id ppc_clk_ids[] __initconst =3D {\n" - "> { .compatible =3D \"fsl,qoriq-clockgen-1.0\", },\n" - "> - { .compatible =3D \"fsl,qoriq-clockgen-2\", },\n" - "> + { .compatible =3D \"fsl,qoriq-clockgen-2.0\", },\n" + "> @@ -260,7 +260,7 @@ static int __init ppc_corenet_clk_probe(struct platform_device *pdev)\n" + "> \n" + "> static const struct of_device_id ppc_clk_ids[] __initconst = {\n" + "> { .compatible = \"fsl,qoriq-clockgen-1.0\", },\n" + "> - { .compatible = \"fsl,qoriq-clockgen-2\", },\n" + "> + { .compatible = \"fsl,qoriq-clockgen-2.0\", },\n" "> {}\n" "> };\n" - "> =\n" - "\n" - "> -- =\n" - "\n" + "> \n" + "> -- \n" > 1.8.0 -2711392b4c0cf1b01a1a427adff45d8ebd42cd31cefe1ea4e20c471f4199ff18 +b47abf606142375f889039ab6834db0a03ce0e4012ff9e86aea692b501082be4
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.