All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <1386543229-1542-2-git-send-email-ynvich@gmail.com>

diff --git a/a/1.txt b/N1/1.txt
index 75f90d4..6ae657a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -20,7 +20,7 @@ index a5e90f0..3419f87 100644
 @@ -113,14 +112,14 @@
  		};
  
- 		usb0: ohci at 4c000000 {
+ 		usb0: ohci@4c000000 {
 -			compatible = "mrvl,pxa-ohci";
 +			compatible = "marvell,pxa-ohci";
  			reg = <0x4c000000 0x10000>;
@@ -28,7 +28,7 @@ index a5e90f0..3419f87 100644
  			status = "disabled";
  		};
  
- 		mmc0: mmc at 41100000 {
+ 		mmc0: mmc@41100000 {
 -			compatible = "mrvl,pxa-mmc";
 +			compatible = "marvell,pxa-mmc";
  			reg = <0x41100000 0x1000>;
diff --git a/a/content_digest b/N1/content_digest
index 726a873..0a1cd2c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,20 @@
  "ref\01386348542-9584-1-git-send-email-ynvich@gmail.com\0"
  "ref\01386543229-1542-1-git-send-email-ynvich@gmail.com\0"
- "From\0ynvich@gmail.com (Sergei Ianovich)\0"
+ "From\0Sergei Ianovich <ynvich@gmail.com>\0"
  "Subject\0[PATCH 1/9] ARM: dts: pxa2xx fix compatible strings\0"
  "Date\0Mon,  9 Dec 2013 02:53:41 +0400\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0linux-kernel@vger.kernel.org"
+ " linux-arm-kernel@lists.infradead.org\0"
+ "Cc\0Sergei Ianovich <ynvich@gmail.com>"
+  Daniel Mack <zonque@gmail.com>
+  Arnd Bergmann <arnd@arndb.de>
+  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 <ijc+devicetree@hellion.org.uk>
+  Russell King <linux@arm.linux.org.uk>
+ " open list:OPEN FIRMWARE AND... <devicetree@vger.kernel.org>\0"
  "\00:1\0"
  "b\0"
  "Signed-off-by: Sergei Ianovich <ynvich@gmail.com>\n"
@@ -28,7 +39,7 @@
  "@@ -113,14 +112,14 @@\n"
  " \t\t};\n"
  " \n"
- " \t\tusb0: ohci at 4c000000 {\n"
+ " \t\tusb0: ohci@4c000000 {\n"
  "-\t\t\tcompatible = \"mrvl,pxa-ohci\";\n"
  "+\t\t\tcompatible = \"marvell,pxa-ohci\";\n"
  " \t\t\treg = <0x4c000000 0x10000>;\n"
@@ -36,7 +47,7 @@
  " \t\t\tstatus = \"disabled\";\n"
  " \t\t};\n"
  " \n"
- " \t\tmmc0: mmc at 41100000 {\n"
+ " \t\tmmc0: mmc@41100000 {\n"
  "-\t\t\tcompatible = \"mrvl,pxa-mmc\";\n"
  "+\t\t\tcompatible = \"marvell,pxa-mmc\";\n"
  " \t\t\treg = <0x41100000 0x1000>;\n"
@@ -45,4 +56,4 @@
  "-- \n"
  1.8.4.3
 
-0924a3105e29c0e59ea1d7a23a685f6fcb79e428eeecc9f8e4f0873706700413
+9844b7bcbd19050493f3fa792ce4161e41278c3421c64eba2936aae974672b81

diff --git a/a/1.txt b/N2/1.txt
index 75f90d4..6ae657a 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -20,7 +20,7 @@ index a5e90f0..3419f87 100644
 @@ -113,14 +112,14 @@
  		};
  
- 		usb0: ohci at 4c000000 {
+ 		usb0: ohci@4c000000 {
 -			compatible = "mrvl,pxa-ohci";
 +			compatible = "marvell,pxa-ohci";
  			reg = <0x4c000000 0x10000>;
@@ -28,7 +28,7 @@ index a5e90f0..3419f87 100644
  			status = "disabled";
  		};
  
- 		mmc0: mmc at 41100000 {
+ 		mmc0: mmc@41100000 {
 -			compatible = "mrvl,pxa-mmc";
 +			compatible = "marvell,pxa-mmc";
  			reg = <0x41100000 0x1000>;
diff --git a/a/content_digest b/N2/content_digest
index 726a873..0a13abe 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -1,9 +1,20 @@
  "ref\01386348542-9584-1-git-send-email-ynvich@gmail.com\0"
  "ref\01386543229-1542-1-git-send-email-ynvich@gmail.com\0"
- "From\0ynvich@gmail.com (Sergei Ianovich)\0"
+ "From\0Sergei Ianovich <ynvich@gmail.com>\0"
  "Subject\0[PATCH 1/9] ARM: dts: pxa2xx fix compatible strings\0"
  "Date\0Mon,  9 Dec 2013 02:53:41 +0400\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0linux-kernel@vger.kernel.org"
+ " linux-arm-kernel@lists.infradead.org\0"
+ "Cc\0Sergei Ianovich <ynvich@gmail.com>"
+  Daniel Mack <zonque@gmail.com>
+  Arnd Bergmann <arnd@arndb.de>
+  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 <ijc+devicetree@hellion.org.uk>
+  Russell King <linux@arm.linux.org.uk>
+ " devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND...)\0"
  "\00:1\0"
  "b\0"
  "Signed-off-by: Sergei Ianovich <ynvich@gmail.com>\n"
@@ -28,7 +39,7 @@
  "@@ -113,14 +112,14 @@\n"
  " \t\t};\n"
  " \n"
- " \t\tusb0: ohci at 4c000000 {\n"
+ " \t\tusb0: ohci@4c000000 {\n"
  "-\t\t\tcompatible = \"mrvl,pxa-ohci\";\n"
  "+\t\t\tcompatible = \"marvell,pxa-ohci\";\n"
  " \t\t\treg = <0x4c000000 0x10000>;\n"
@@ -36,7 +47,7 @@
  " \t\t\tstatus = \"disabled\";\n"
  " \t\t};\n"
  " \n"
- " \t\tmmc0: mmc at 41100000 {\n"
+ " \t\tmmc0: mmc@41100000 {\n"
  "-\t\t\tcompatible = \"mrvl,pxa-mmc\";\n"
  "+\t\t\tcompatible = \"marvell,pxa-mmc\";\n"
  " \t\t\treg = <0x41100000 0x1000>;\n"
@@ -45,4 +56,4 @@
  "-- \n"
  1.8.4.3
 
-0924a3105e29c0e59ea1d7a23a685f6fcb79e428eeecc9f8e4f0873706700413
+ffba3096241d67a6d06e12f1bcba00c02a58ca9b2e2116aa6294d659a10b0010

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.