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

diff --git a/a/1.txt b/N1/1.txt
index b6f7665..1007e43 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -23,7 +23,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>;
@@ -31,7 +31,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 3a714b2..62c7a77 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,20 @@
  "ref\01386543229-1542-1-git-send-email-ynvich@gmail.com\0"
  "ref\01386901645-28895-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 v2 01/16] ARM: dts: pxa2xx fix compatible strings\0"
  "Date\0Fri, 13 Dec 2013 06:27:10 +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"
@@ -31,7 +42,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"
@@ -39,7 +50,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"
@@ -48,4 +59,4 @@
  "-- \n"
  1.8.4.3
 
-e233dbfc3cf837da79f5aff2dd393e8b27e41912d91a2fd10823e50f05470ef6
+a2fac2f80b49b7e41cbc7087394e4a7462ace2e0903c8fc6bc5e5c9f2c1e095d

diff --git a/a/1.txt b/N2/1.txt
index b6f7665..1007e43 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -23,7 +23,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>;
@@ -31,7 +31,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 3a714b2..8bdc3db 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -1,9 +1,20 @@
  "ref\01386543229-1542-1-git-send-email-ynvich@gmail.com\0"
  "ref\01386901645-28895-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 v2 01/16] ARM: dts: pxa2xx fix compatible strings\0"
  "Date\0Fri, 13 Dec 2013 06:27:10 +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"
@@ -31,7 +42,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"
@@ -39,7 +50,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"
@@ -48,4 +59,4 @@
  "-- \n"
  1.8.4.3
 
-e233dbfc3cf837da79f5aff2dd393e8b27e41912d91a2fd10823e50f05470ef6
+56c7e07015259f25e49d09b2efa444c6e8a9008345196127361a02db139af0de

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.