diff for duplicates of <52249B16.8010409@cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index e6d1cc3..42aa97c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,14 +9,15 @@ On 09/02/2013 05:14 PM, Laurent Pinchart wrote: >> 1 file changed, 11 insertions(+) >> Index: renesas/arch/arm/boot/dts/r8a7778.dtsi ->> =================================>> --- renesas.orig/arch/arm/boot/dts/r8a7778.dtsi +>> =================================================================== +>> --- renesas.orig/arch/arm/boot/dts/r8a7778.dtsi >> +++ renesas/arch/arm/boot/dts/r8a7778.dtsi >> @@ -98,4 +98,15 @@ >> reg = <0xfffc000 0x118>; >> #gpio-range-cells = <3>; >> }; >> + ->> + ether: ethernet@fde00000 { +>> + ether: ethernet at fde00000 { >> + device_type = "network"; > Documentation/devicetree/bindings/net/sh_eth.txt from "[PATCH 2/2] sh_eth: add diff --git a/a/content_digest b/N1/content_digest index c2373f3..95a863d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,10 @@ - "ref\087ehb8th3c.wl%kuninori.morimoto.gx@renesas.com\0" - "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" - "Subject\0Re: [PATCH 1/4] ARM: shmobile: r8a7778: add Ether DT support\0" - "Date\0Mon, 02 Sep 2013 14:05:10 +0000\0" - "To\0linux-sh@vger.kernel.org\0" + "ref\0201309010311.05466.sergei.shtylyov@cogentembedded.com\0" + "ref\0201309010315.49763.sergei.shtylyov@cogentembedded.com\0" + "ref\01643070.uIkONXsrBj@avalon\0" + "From\0sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)\0" + "Subject\0[PATCH 1/4] ARM: shmobile: r8a7778: add Ether DT support\0" + "Date\0Mon, 02 Sep 2013 18:05:10 +0400\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 09/02/2013 05:14 PM, Laurent Pinchart wrote:\n" @@ -16,14 +18,15 @@ ">> 1 file changed, 11 insertions(+)\n" "\n" ">> Index: renesas/arch/arm/boot/dts/r8a7778.dtsi\n" - ">> =================================>> --- renesas.orig/arch/arm/boot/dts/r8a7778.dtsi\n" + ">> ===================================================================\n" + ">> --- renesas.orig/arch/arm/boot/dts/r8a7778.dtsi\n" ">> +++ renesas/arch/arm/boot/dts/r8a7778.dtsi\n" ">> @@ -98,4 +98,15 @@\n" ">> \t\treg = <0xfffc000 0x118>;\n" ">> \t\t#gpio-range-cells = <3>;\n" ">> \t};\n" ">> +\n" - ">> +\tether: ethernet@fde00000 {\n" + ">> +\tether: ethernet at fde00000 {\n" ">> +\t\tdevice_type = \"network\";\n" "\n" "> Documentation/devicetree/bindings/net/sh_eth.txt from \"[PATCH 2/2] sh_eth: add\n" @@ -34,4 +37,4 @@ "\n" WBR, Sergei -53174dee80e79fe6f6bb9c2e2101729eb6442a851773710a0135f2c967c8f591 +0e6d503b20aeb63c9dca9aa22ffdb281085705f68a117361bf578bac242d8bf4
diff --git a/a/1.txt b/N2/1.txt index e6d1cc3..14ede34 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -9,7 +9,8 @@ On 09/02/2013 05:14 PM, Laurent Pinchart wrote: >> 1 file changed, 11 insertions(+) >> Index: renesas/arch/arm/boot/dts/r8a7778.dtsi ->> =================================>> --- renesas.orig/arch/arm/boot/dts/r8a7778.dtsi +>> =================================================================== +>> --- renesas.orig/arch/arm/boot/dts/r8a7778.dtsi >> +++ renesas/arch/arm/boot/dts/r8a7778.dtsi >> @@ -98,4 +98,15 @@ >> reg = <0xfffc000 0x118>; diff --git a/a/content_digest b/N2/content_digest index c2373f3..f1f0be9 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,21 @@ - "ref\087ehb8th3c.wl%kuninori.morimoto.gx@renesas.com\0" + "ref\0201309010311.05466.sergei.shtylyov@cogentembedded.com\0" + "ref\0201309010315.49763.sergei.shtylyov@cogentembedded.com\0" + "ref\01643070.uIkONXsrBj@avalon\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0Re: [PATCH 1/4] ARM: shmobile: r8a7778: add Ether DT support\0" - "Date\0Mon, 02 Sep 2013 14:05:10 +0000\0" - "To\0linux-sh@vger.kernel.org\0" + "Date\0Mon, 02 Sep 2013 18:05:10 +0400\0" + "To\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" + "Cc\0horms@verge.net.au" + linux-sh@vger.kernel.org + rob.herring@calxeda.com + pawel.moll@arm.com + mark.rutland@arm.com + swarren@wwwdotorg.org + ian.campbell@citrix.com + devicetree@vger.kernel.org + magnus.damm@gmail.com + linux@arm.linux.org.uk + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 09/02/2013 05:14 PM, Laurent Pinchart wrote:\n" @@ -16,7 +29,8 @@ ">> 1 file changed, 11 insertions(+)\n" "\n" ">> Index: renesas/arch/arm/boot/dts/r8a7778.dtsi\n" - ">> =================================>> --- renesas.orig/arch/arm/boot/dts/r8a7778.dtsi\n" + ">> ===================================================================\n" + ">> --- renesas.orig/arch/arm/boot/dts/r8a7778.dtsi\n" ">> +++ renesas/arch/arm/boot/dts/r8a7778.dtsi\n" ">> @@ -98,4 +98,15 @@\n" ">> \t\treg = <0xfffc000 0x118>;\n" @@ -34,4 +48,4 @@ "\n" WBR, Sergei -53174dee80e79fe6f6bb9c2e2101729eb6442a851773710a0135f2c967c8f591 +fad659df5ed1564aee50fff8a5374a8d8667ace8d1ad99f944fe668fbb6cdc6a
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.