diff for duplicates of <20140609021535.GX8860@dragon> diff --git a/a/1.txt b/N1/1.txt index b3cc46e..887c934 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ -On Fri, Jun 06, 2014 at 01:02:59PM +0200, Lothar Wa?mann wrote: +On Fri, Jun 06, 2014 at 01:02:59PM +0200, Lothar Waßmann wrote: > -> Signed-off-by: Lothar Wa?mann <LW@KARO-electronics.de> +> Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> > --- > arch/arm/boot/dts/imx6qdl.dtsi | 2 ++ > 1 file changed, 2 insertions(+) @@ -17,14 +17,14 @@ Shawn > @@ -466,8 +466,10 @@ > }; > -> kpp: kpp at 020b8000 { +> kpp: kpp@020b8000 { > + compatible = "fsl,imx6q-kpp", "fsl,imx21-kpp"; > reg = <0x020b8000 0x4000>; > interrupts = <0 82 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&clks 62>; /* IPG clock */ > }; > -> wdog1: wdog at 020bc000 { +> wdog1: wdog@020bc000 { > -- > 1.7.10.4 > diff --git a/a/content_digest b/N1/content_digest index db91565..5fbc335 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,23 @@ "ref\01402052579-22803-1-git-send-email-LW@KARO-electronics.de\0" - "From\0shawn.guo@freescale.com (Shawn Guo)\0" - "Subject\0[PATCH] ARM: dts: imx6: add missing compatible and clock properties for kpp\0" + "From\0Shawn Guo <shawn.guo@freescale.com>\0" + "Subject\0Re: [PATCH] ARM: dts: imx6: add missing compatible and clock properties for kpp\0" "Date\0Mon, 9 Jun 2014 10:15:36 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Lothar Wa\303\237mann <LW@karo-electronics.de>\0" + "Cc\0Ian Campbell <ijc+devicetree@hellion.org.uk>" + Kumar Gala <galak@codeaurora.org> + Mark Rutland <mark.rutland@arm.com> + Pawel Moll <pawel.moll@arm.com> + Rob Herring <robh+dt@kernel.org> + Russell King <linux@arm.linux.org.uk> + Sascha Hauer <kernel@pengutronix.de> + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" - "On Fri, Jun 06, 2014 at 01:02:59PM +0200, Lothar Wa?mann wrote:\n" + "On Fri, Jun 06, 2014 at 01:02:59PM +0200, Lothar Wa\303\237mann wrote:\n" "> \n" - "> Signed-off-by: Lothar Wa?mann <LW@KARO-electronics.de>\n" + "> Signed-off-by: Lothar Wa\303\237mann <LW@KARO-electronics.de>\n" "> ---\n" "> arch/arm/boot/dts/imx6qdl.dtsi | 2 ++\n" "> 1 file changed, 2 insertions(+)\n" @@ -24,16 +34,16 @@ "> @@ -466,8 +466,10 @@\n" "> \t\t\t};\n" "> \n" - "> \t\t\tkpp: kpp at 020b8000 {\n" + "> \t\t\tkpp: kpp@020b8000 {\n" "> +\t\t\t\tcompatible = \"fsl,imx6q-kpp\", \"fsl,imx21-kpp\";\n" "> \t\t\t\treg = <0x020b8000 0x4000>;\n" "> \t\t\t\tinterrupts = <0 82 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t\t\t\tclocks = <&clks 62>; /* IPG clock */\n" "> \t\t\t};\n" "> \n" - "> \t\t\twdog1: wdog at 020bc000 {\n" + "> \t\t\twdog1: wdog@020bc000 {\n" "> -- \n" "> 1.7.10.4\n" > -4e4bbd437dab06d0a67d9ecddb694592a77ebd131d0b17f8a9fc03078ae13b2e +6b113013779b972352a0b1c6a688a3cd7a68405909fe6d401b163f1b1319402c
diff --git a/a/1.txt b/N2/1.txt index b3cc46e..887c934 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,6 +1,6 @@ -On Fri, Jun 06, 2014 at 01:02:59PM +0200, Lothar Wa?mann wrote: +On Fri, Jun 06, 2014 at 01:02:59PM +0200, Lothar Waßmann wrote: > -> Signed-off-by: Lothar Wa?mann <LW@KARO-electronics.de> +> Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> > --- > arch/arm/boot/dts/imx6qdl.dtsi | 2 ++ > 1 file changed, 2 insertions(+) @@ -17,14 +17,14 @@ Shawn > @@ -466,8 +466,10 @@ > }; > -> kpp: kpp at 020b8000 { +> kpp: kpp@020b8000 { > + compatible = "fsl,imx6q-kpp", "fsl,imx21-kpp"; > reg = <0x020b8000 0x4000>; > interrupts = <0 82 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&clks 62>; /* IPG clock */ > }; > -> wdog1: wdog at 020bc000 { +> wdog1: wdog@020bc000 { > -- > 1.7.10.4 > diff --git a/a/content_digest b/N2/content_digest index db91565..31637ab 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,13 +1,23 @@ "ref\01402052579-22803-1-git-send-email-LW@KARO-electronics.de\0" - "From\0shawn.guo@freescale.com (Shawn Guo)\0" - "Subject\0[PATCH] ARM: dts: imx6: add missing compatible and clock properties for kpp\0" + "From\0Shawn Guo <shawn.guo@freescale.com>\0" + "Subject\0Re: [PATCH] ARM: dts: imx6: add missing compatible and clock properties for kpp\0" "Date\0Mon, 9 Jun 2014 10:15:36 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Lothar Wa\303\237mann <LW@karo-electronics.de>\0" + "Cc\0Ian Campbell <ijc+devicetree@hellion.org.uk>" + Kumar Gala <galak@codeaurora.org> + Mark Rutland <mark.rutland@arm.com> + Pawel Moll <pawel.moll@arm.com> + Rob Herring <robh+dt@kernel.org> + Russell King <linux@arm.linux.org.uk> + Sascha Hauer <kernel@pengutronix.de> + <devicetree@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> + " <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" - "On Fri, Jun 06, 2014 at 01:02:59PM +0200, Lothar Wa?mann wrote:\n" + "On Fri, Jun 06, 2014 at 01:02:59PM +0200, Lothar Wa\303\237mann wrote:\n" "> \n" - "> Signed-off-by: Lothar Wa?mann <LW@KARO-electronics.de>\n" + "> Signed-off-by: Lothar Wa\303\237mann <LW@KARO-electronics.de>\n" "> ---\n" "> arch/arm/boot/dts/imx6qdl.dtsi | 2 ++\n" "> 1 file changed, 2 insertions(+)\n" @@ -24,16 +34,16 @@ "> @@ -466,8 +466,10 @@\n" "> \t\t\t};\n" "> \n" - "> \t\t\tkpp: kpp at 020b8000 {\n" + "> \t\t\tkpp: kpp@020b8000 {\n" "> +\t\t\t\tcompatible = \"fsl,imx6q-kpp\", \"fsl,imx21-kpp\";\n" "> \t\t\t\treg = <0x020b8000 0x4000>;\n" "> \t\t\t\tinterrupts = <0 82 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t\t\t\tclocks = <&clks 62>; /* IPG clock */\n" "> \t\t\t};\n" "> \n" - "> \t\t\twdog1: wdog at 020bc000 {\n" + "> \t\t\twdog1: wdog@020bc000 {\n" "> -- \n" "> 1.7.10.4\n" > -4e4bbd437dab06d0a67d9ecddb694592a77ebd131d0b17f8a9fc03078ae13b2e +a845d1d594dff0c111d3ea421ef3013f21b8813ce4f8f459f9a2d76335b5166d
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.