diff for duplicates of <6380d62a1b1ca498f2187c9702f1dec00ad527e0.1447981420.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index 1fe4701..547b45a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -36,7 +36,7 @@ index 1575ef759047..d842ce77b7c8 100644
+
+ status = "okay";
+
-+ flash@0 {
++ flash at 0 {
+ compatible = "spansion,s25fl512s", "jedec,spi-nor";
+ reg = <0>;
+ spi-max-frequency = <30000000>;
@@ -50,17 +50,17 @@ index 1575ef759047..d842ce77b7c8 100644
+ #address-cells = <1>;
+ #size-cells = <1>;
+
-+ 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 6a53d80..2a97830 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
"ref\0cover.1447981420.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 18/29] ARM: shmobile: gose: Add QSPI device to DT\0"
]
[
- "Date\0Fri, 20 Nov 2015 01:05:25 +0000\0"
+ "Date\0Thu, 19 Nov 2015 17:05:25 -0800\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -58,7 +58,7 @@
"+\n",
"+\tstatus = \"okay\";\n",
"+\n",
- "+\tflash\@0 {\n",
+ "+\tflash at 0 {\n",
"+\t\tcompatible = \"spansion,s25fl512s\", \"jedec,spi-nor\";\n",
"+\t\treg = <0>;\n",
"+\t\tspi-max-frequency = <30000000>;\n",
@@ -72,17 +72,17 @@
"+\t\t\t#address-cells = <1>;\n",
"+\t\t\t#size-cells = <1>;\n",
"+\n",
- "+\t\t\tpartition\@0 {\n",
+ "+\t\t\tpartition at 0 {\n",
"+\t\t\t\tlabel = \"loader\";\n",
"+\t\t\t\treg = <0x00000000 0x00040000>;\n",
"+\t\t\t\tread-only;\n",
"+\t\t\t};\n",
- "+\t\t\tpartition\@40000 {\n",
+ "+\t\t\tpartition at 40000 {\n",
"+\t\t\t\tlabel = \"user\";\n",
"+\t\t\t\treg = <0x00040000 0x00400000>;\n",
"+\t\t\t\tread-only;\n",
"+\t\t\t};\n",
- "+\t\t\tpartition\@440000 {\n",
+ "+\t\t\tpartition at 440000 {\n",
"+\t\t\t\tlabel = \"flash\";\n",
"+\t\t\t\treg = <0x00440000 0x03bc0000>;\n",
"+\t\t\t};\n",
@@ -93,4 +93,4 @@
"2.1.4"
]
-f0c8e43e5ab2b5017edc79bbccac9a95ffacb93fa86bdacb7c261639d068826b
+3e191a72301455be8f80b39c53ec3206d62bfcff974dbac7528098a9f138540e
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.