diff for duplicates of <0ebdbc505b620ab4397c3105d36a5383fb16b151.1442536920.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index 74ad9cb..1863a63 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -40,7 +40,7 @@ index d4dd5a30ccdf..f49bc00738a3 100644
+
+ status = "okay";
+
-+ flash@0 {
++ flash at 0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "spansion,s25fl512s", "jedec,spi-nor";
@@ -52,17 +52,17 @@ index d4dd5a30ccdf..f49bc00738a3 100644
+ spi-cpha;
+ m25p,fast-read;
+
-+ partition@0 {
++ partition at 0 {
+ label = "loader";
+ reg = <0x00000000 0x00040000>;
+ read-only;
+ };
-+ partition@40000 {
++ partition at 40000 {
+ label = "user";
+ reg = <0x00040000 0x00400000>;
+ read-only;
+ };
-+ partition@440000 {
++ partition at 440000 {
+ label = "flash";
+ reg = <0x00440000 0x03bc0000>;
+ };
diff --git a/a/content_digest b/N1/content_digest
index c27b165..c9839fa 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
"ref\0cover.1442536920.git.horms+renesas\@verge.net.au\0"
]
[
- "From\0Simon Horman <horms+renesas\@verge.net.au>\0"
+ "From\0horms+renesas\@verge.net.au (Simon Horman)\0"
]
[
"Subject\0[PATCH 05/19] ARM: shmobile: silk: add QSPI DT support\0"
]
[
- "Date\0Fri, 18 Sep 2015 00:47:07 +0000\0"
+ "Date\0Fri, 18 Sep 2015 09:47:07 +0900\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -62,7 +62,7 @@
"+\n",
"+\tstatus = \"okay\";\n",
"+\n",
- "+\tflash\@0 {\n",
+ "+\tflash at 0 {\n",
"+\t\t#address-cells = <1>;\n",
"+\t\t#size-cells = <1>;\n",
"+\t\tcompatible = \"spansion,s25fl512s\", \"jedec,spi-nor\";\n",
@@ -74,17 +74,17 @@
"+\t\tspi-cpha;\n",
"+\t\tm25p,fast-read;\n",
"+\n",
- "+\t\tpartition\@0 {\n",
+ "+\t\tpartition at 0 {\n",
"+\t\t\tlabel = \"loader\";\n",
"+\t\t\treg = <0x00000000 0x00040000>;\n",
"+\t\t\tread-only;\n",
"+\t\t};\n",
- "+\t\tpartition\@40000 {\n",
+ "+\t\tpartition at 40000 {\n",
"+\t\t\tlabel = \"user\";\n",
"+\t\t\treg = <0x00040000 0x00400000>;\n",
"+\t\t\tread-only;\n",
"+\t\t};\n",
- "+\t\tpartition\@440000 {\n",
+ "+\t\tpartition at 440000 {\n",
"+\t\t\tlabel = \"flash\";\n",
"+\t\t\treg = <0x00440000 0x03bc0000>;\n",
"+\t\t};\n",
@@ -94,4 +94,4 @@
"2.1.4"
]
-d386fe1e3e6d87d0691a7758ff3ab5ebbb3145c4361fb3ec800c3c296668b64b
+57dd4dd7ade9d362a44eb829cb863f3440a17dbd9eccec261b4a4804ca867cad
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.