All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <76573995.iPm3QS0b9I@avalon>

diff --git a/a/1.txt b/N1/1.txt
index b3b3050..4e97925 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -11,14 +11,15 @@ On Wednesday 04 September 2013 14:35:14 Magnus Damm 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";
 > >>> +               compatible = "renesas,ether-r8a7779";
 > >> 
diff --git a/a/content_digest b/N1/content_digest
index aabcc54..d8a4c1c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,10 @@
- "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\0Wed, 04 Sep 2013 09:39:59 +0000\0"
- "To\0linux-sh@vger.kernel.org\0"
+ "ref\0201309010311.05466.sergei.shtylyov@cogentembedded.com\0"
+ "ref\052262A1B.4050406@cogentembedded.com\0"
+ "ref\0CANqRtoSfsEwqJhh9DgX6jxK5DjH5FeroMAcsvss5o2vAzFk-pg@mail.gmail.com\0"
+ "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0"
+ "Subject\0[PATCH 1/4] ARM: shmobile: r8a7778: add Ether DT support\0"
+ "Date\0Wed, 04 Sep 2013 11:39:59 +0200\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Wednesday 04 September 2013 14:35:14 Magnus Damm wrote:\n"
@@ -18,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"
  "> >>>                  reg = <0xfffc000 0x118>;\n"
  "> >>>                  #gpio-range-cells = <3>;\n"
  "> >>>          };\n"
  "> >>> +\n"
- "> >>> +       ether: ethernet@fde00000 {\n"
+ "> >>> +       ether: ethernet at fde00000 {\n"
  "> >>> +               device_type = \"network\";\n"
  "> >>> +               compatible = \"renesas,ether-r8a7779\";\n"
  "> >> \n"
@@ -74,4 +77,4 @@
  "\n"
  Laurent Pinchart
 
-f9243e78e4d891f9e63f4c990aef7c85d3045f71d9308fb2526bfd3997871120
+001064657be352c5f7417ffc1edee2070c9c36c17e5911568deca8da02bd0461

diff --git a/a/1.txt b/N2/1.txt
index b3b3050..714f0f9 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -11,7 +11,8 @@ On Wednesday 04 September 2013 14:35:14 Magnus Damm 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 aabcc54..fe8a2e0 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\052262A1B.4050406@cogentembedded.com\0"
+ "ref\0CANqRtoSfsEwqJhh9DgX6jxK5DjH5FeroMAcsvss5o2vAzFk-pg@mail.gmail.com\0"
  "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0"
  "Subject\0Re: [PATCH 1/4] ARM: shmobile: r8a7778: add Ether DT support\0"
- "Date\0Wed, 04 Sep 2013 09:39:59 +0000\0"
- "To\0linux-sh@vger.kernel.org\0"
+ "Date\0Wed, 04 Sep 2013 11:39:59 +0200\0"
+ "To\0Magnus Damm <magnus.damm@gmail.com>\0"
+ "Cc\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>"
+  Simon Horman [Horms] <horms@verge.net.au>
+  SH-Linux <linux-sh@vger.kernel.org>
+  Rob Herring <rob.herring@calxeda.com>
+  Pawel Moll <pawel.moll@arm.com>
+  Mark Rutland <mark.rutland@arm.com>
+  Stephen Warren <swarren@wwwdotorg.org>
+  ian.campbell@citrix.com
+  devicetree@vger.kernel.org
+  Russell King - ARM Linux <linux@arm.linux.org.uk>
+ " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0"
  "\00:1\0"
  "b\0"
  "On Wednesday 04 September 2013 14:35:14 Magnus Damm wrote:\n"
@@ -18,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"
  "> >>>                  reg = <0xfffc000 0x118>;\n"
@@ -74,4 +88,4 @@
  "\n"
  Laurent Pinchart
 
-f9243e78e4d891f9e63f4c990aef7c85d3045f71d9308fb2526bfd3997871120
+371039dc4845458f677371164458dbdb2fc0873a80ec26e3afd80f1ce2edffe6

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.