diff for duplicates of <1643070.uIkONXsrBj@avalon> diff --git a/a/1.txt b/N1/1.txt index 13f1c40..b9eeb3d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,14 +12,15 @@ On Sunday 01 September 2013 03:15:48 Sergei Shtylyov 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 47f05ac..edfdd40 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,9 @@ - "ref\087ehb8th3c.wl%kuninori.morimoto.gx@renesas.com\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH 1/4] ARM: shmobile: r8a7778: add Ether DT support\0" - "Date\0Mon, 02 Sep 2013 13:14:37 +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" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH 1/4] ARM: shmobile: r8a7778: add Ether DT support\0" + "Date\0Mon, 02 Sep 2013 15:14:37 +0200\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Sergei,\n" @@ -19,14 +20,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" @@ -47,4 +49,4 @@ "\n" Laurent Pinchart -2e916982eeb1811bffc5e4d70f1c51c7312a02b55852f4d32f750bbd928aaefa +0181f34626a251400b77d035a9e9248ab46d8da1127e191e3f57f3a8d2873fea
diff --git a/a/1.txt b/N2/1.txt index 13f1c40..df65b17 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -12,7 +12,8 @@ On Sunday 01 September 2013 03:15:48 Sergei Shtylyov 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 47f05ac..7d13c95 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,20 @@ - "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" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH 1/4] ARM: shmobile: r8a7778: add Ether DT support\0" - "Date\0Mon, 02 Sep 2013 13:14:37 +0000\0" - "To\0linux-sh@vger.kernel.org\0" + "Date\0Mon, 02 Sep 2013 15:14:37 +0200\0" + "To\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.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" "Hi Sergei,\n" @@ -19,7 +31,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" @@ -47,4 +60,4 @@ "\n" Laurent Pinchart -2e916982eeb1811bffc5e4d70f1c51c7312a02b55852f4d32f750bbd928aaefa +4bda92b2049cc3e49da09fb9be5fe2c4556661e90004c7755139fc281fb36f5b
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.