diff for duplicates of <52F8CBFB.5060707@codethink.co.uk> diff --git a/a/1.txt b/N1/1.txt index e9bde13..b9e1a34 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,7 +8,8 @@ On 06/02/14 22:12, Sergei Shtylyov wrote: > 1 file changed, 14 insertions(+), 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 > @@ -2,7 +2,8 @@ > * Device Tree Source for the r8a7791 SoC @@ -24,7 +25,7 @@ On 06/02/14 22:12, Sergei Shtylyov wrote: > status = "disabled"; > }; > -> + ether: ethernet@ee700000 { +> + ether: ethernet at ee700000 { > + compatible = "renesas,ether-r8a7791"; > + reg = <0 0xee700000 0 0x400>; > + interrupt-parent = <&gic>; diff --git a/a/content_digest b/N1/content_digest index de468c7..ab770a5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "ref\0201402070112.48304.sergei.shtylyov@cogentembedded.com\0" - "From\0Ben Dooks <ben.dooks@codethink.co.uk>\0" - "Subject\0Re: [PATCH 1/2] ARM: shmobile: r8a7791: add Ether DT support\0" + "From\0ben.dooks@codethink.co.uk (Ben Dooks)\0" + "Subject\0[PATCH 1/2] ARM: shmobile: r8a7791: add Ether DT support\0" "Date\0Mon, 10 Feb 2014 12:54:19 +0000\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" @@ -15,7 +15,8 @@ "> 1 file changed, 14 insertions(+), 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" "> @@ -2,7 +2,8 @@\n" "> * Device Tree Source for the r8a7791 SoC\n" @@ -31,7 +32,7 @@ "> \t\tstatus = \"disabled\";\n" "> \t};\n" ">\n" - "> +\tether: ethernet@ee700000 {\n" + "> +\tether: ethernet at ee700000 {\n" "> +\t\tcompatible = \"renesas,ether-r8a7791\";\n" "> +\t\treg = <0 0xee700000 0 0x400>;\n" "> +\t\tinterrupt-parent = <&gic>;\n" @@ -50,4 +51,4 @@ "Ben Dooks\t\t\t\thttp://www.codethink.co.uk/\n" "Senior Engineer\t\t\t\tCodethink - Providing Genius" -c6375eaf5c8900a6219095d8fcf1475dee0f5e4c3b13e654f54a5c4ea3db6563 +72874b536825eeb55be10e62b1ac33aebeefc689657d694aaf0fa84c75a3c1fb
diff --git a/a/1.txt b/N2/1.txt index e9bde13..deceff1 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -8,7 +8,8 @@ On 06/02/14 22:12, Sergei Shtylyov wrote: > 1 file changed, 14 insertions(+), 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 > @@ -2,7 +2,8 @@ > * Device Tree Source for the r8a7791 SoC diff --git a/a/content_digest b/N2/content_digest index de468c7..2043680 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,18 @@ "From\0Ben Dooks <ben.dooks@codethink.co.uk>\0" "Subject\0Re: [PATCH 1/2] ARM: shmobile: r8a7791: add Ether DT support\0" "Date\0Mon, 10 Feb 2014 12:54:19 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" + "Cc\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 + magnus.damm@gmail.com + linux@arm.linux.org.uk + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 06/02/14 22:12, Sergei Shtylyov wrote:\n" @@ -15,7 +26,8 @@ "> 1 file changed, 14 insertions(+), 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" "> @@ -2,7 +2,8 @@\n" "> * Device Tree Source for the r8a7791 SoC\n" @@ -50,4 +62,4 @@ "Ben Dooks\t\t\t\thttp://www.codethink.co.uk/\n" "Senior Engineer\t\t\t\tCodethink - Providing Genius" -c6375eaf5c8900a6219095d8fcf1475dee0f5e4c3b13e654f54a5c4ea3db6563 +c3321615778e1b4336cece2cda24d56335fdefc21d6852136d3a97626751f579
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.