All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <e9e18ab5aa7a147aaa63d1900ad52174413e86d9.1447333689.git.p.fedin@samsung.com>

diff --git a/a/content_digest b/N1/content_digest
index d5263ac..cd7e275 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -17,13 +17,13 @@
   " linux-kernel\@vger.kernel.org\0"
 ]
 [
-  "Cc\0Rob Herring <robh+dt\@kernel.org>",
+  "Cc\0Mark Rutland <mark.rutland\@arm.com>",
+  " Krzysztof Kozlowski <k.kozlowski\@samsung.com>",
   " Pawel Moll <pawel.moll\@arm.com>",
-  " Mark Rutland <mark.rutland\@arm.com>",
   " Ian Campbell <ijc+devicetree\@hellion.org.uk>",
-  " Kumar Gala <galak\@codeaurora.org>",
+  " Rob Herring <robh+dt\@kernel.org>",
   " Kukjin Kim <kgene\@kernel.org>",
-  " Krzysztof Kozlowski <k.kozlowski\@samsung.com>\0"
+  " Kumar Gala <galak\@codeaurora.org>\0"
 ]
 [
   "\0000:1\0"
@@ -131,4 +131,4 @@
   "2.4.4"
 ]
 
-831c2b462e9ba4b57aee4dd646a452686cacea551d2e580918cbbde80bc8f972
+4037bd38afb1db66a808e5432add8257c9462055b2b34ec6d3245b9b48045988

diff --git a/a/1.txt b/N2/1.txt
index 8979a4f..10595c7 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -61,13 +61,13 @@ index 33886d5..07c8507 100644
 +			   If omitted, default of 0 is used.
 +
 +Example: basic definition, no banks are configured
-+	sromc@12570000 {
++	sromc at 12570000 {
 +		compatible = "samsung,exynos-srom";
 +		reg = <0x12570000 0x14>;
 +	};
 +
 +Example: SROMc with SMSC911x ethernet chip on bank 3
- 	sromc@12570000 {
+ 	sromc at 12570000 {
 +		#address-cells = <2>;
 +		#size-cells = <1>;
 +		ranges = <0 0 0x04000000 0x20000   // Bank0
@@ -79,7 +79,7 @@ index 33886d5..07c8507 100644
 -		reg = <0x12570000 0x10>;
 +		reg = <0x12570000 0x14>;
 +
-+		ethernet@3 {
++		ethernet at 3 {
 +			compatible = "smsc,lan9115";
 +			reg = <3 0 0x10000>;	   // Bank 3, offset = 0
 +			phy-mode = "mii";
diff --git a/a/content_digest b/N2/content_digest
index d5263ac..bc47585 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
   "ref\0cover.1447333689.git.p.fedin\@samsung.com\0"
 ]
 [
-  "From\0Pavel Fedin <p.fedin\@samsung.com>\0"
+  "From\0p.fedin\@samsung.com (Pavel Fedin)\0"
 ]
 [
   "Subject\0[PATCH v8 1/4] Documentation: dt-bindings: Describe SROMc configuration\0"
@@ -11,19 +11,7 @@
   "Date\0Thu, 12 Nov 2015 16:12:04 +0300\0"
 ]
 [
-  "To\0devicetree\@vger.kernel.org",
-  " linux-arm-kernel\@lists.infradead.org",
-  " linux-samsung-soc\@vger.kernel.org",
-  " linux-kernel\@vger.kernel.org\0"
-]
-[
-  "Cc\0Rob Herring <robh+dt\@kernel.org>",
-  " Pawel Moll <pawel.moll\@arm.com>",
-  " Mark Rutland <mark.rutland\@arm.com>",
-  " Ian Campbell <ijc+devicetree\@hellion.org.uk>",
-  " Kumar Gala <galak\@codeaurora.org>",
-  " Kukjin Kim <kgene\@kernel.org>",
-  " Krzysztof Kozlowski <k.kozlowski\@samsung.com>\0"
+  "To\0linux-arm-kernel\@lists.infradead.org\0"
 ]
 [
   "\0000:1\0"
@@ -95,13 +83,13 @@
   "+\t\t\t   If omitted, default of 0 is used.\n",
   "+\n",
   "+Example: basic definition, no banks are configured\n",
-  "+\tsromc\@12570000 {\n",
+  "+\tsromc at 12570000 {\n",
   "+\t\tcompatible = \"samsung,exynos-srom\";\n",
   "+\t\treg = <0x12570000 0x14>;\n",
   "+\t};\n",
   "+\n",
   "+Example: SROMc with SMSC911x ethernet chip on bank 3\n",
-  " \tsromc\@12570000 {\n",
+  " \tsromc at 12570000 {\n",
   "+\t\t#address-cells = <2>;\n",
   "+\t\t#size-cells = <1>;\n",
   "+\t\tranges = <0 0 0x04000000 0x20000   // Bank0\n",
@@ -113,7 +101,7 @@
   "-\t\treg = <0x12570000 0x10>;\n",
   "+\t\treg = <0x12570000 0x14>;\n",
   "+\n",
-  "+\t\tethernet\@3 {\n",
+  "+\t\tethernet at 3 {\n",
   "+\t\t\tcompatible = \"smsc,lan9115\";\n",
   "+\t\t\treg = <3 0 0x10000>;\t   // Bank 3, offset = 0\n",
   "+\t\t\tphy-mode = \"mii\";\n",
@@ -131,4 +119,4 @@
   "2.4.4"
 ]
 
-831c2b462e9ba4b57aee4dd646a452686cacea551d2e580918cbbde80bc8f972
+4436207e2de53a4d5cb3d2e9e176a4e38fed807511fbbea9a0a462353536f379
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.