diff for duplicates of <6d879a097acaeaa9deba6d4949b466886b18652e.1398216022.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index 29a5d9a..3474bce 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -19,7 +19,7 @@ index 06cda19..f76f6ec 100644
pinctrl-names = "default";
status = "okay";
+
-+ flash: flash@0 {
++ flash: flash at 0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "spansion,s25fl008k";
@@ -27,7 +27,7 @@ index 06cda19..f76f6ec 100644
+ spi-max-frequency = <104000000>;
+ m25p,fast-read;
+
-+ partition@0 {
++ partition at 0 {
+ label = "data(spi)";
+ reg = <0x00000000 0x00100000>;
+ };
diff --git a/a/content_digest b/N1/content_digest
index 3ceaf6c..a032ad9 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
"ref\0cover.1398216022.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 10/33] ARM: shmobile: bockw reference dts: Add SPI FLASH\0"
]
[
- "Date\0Wed, 23 Apr 2014 01:25:38 +0000\0"
+ "Date\0Wed, 23 Apr 2014 10:25:38 +0900\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -41,7 +41,7 @@
" \tpinctrl-names = \"default\";\n",
" \tstatus = \"okay\";\n",
"+\n",
- "+\tflash: flash\@0 {\n",
+ "+\tflash: flash at 0 {\n",
"+\t\t#address-cells = <1>;\n",
"+\t\t#size-cells = <1>;\n",
"+\t\tcompatible = \"spansion,s25fl008k\";\n",
@@ -49,7 +49,7 @@
"+\t\tspi-max-frequency = <104000000>;\n",
"+\t\tm25p,fast-read;\n",
"+\n",
- "+\t\tpartition\@0 {\n",
+ "+\t\tpartition at 0 {\n",
"+\t\t\tlabel = \"data(spi)\";\n",
"+\t\t\treg = <0x00000000 0x00100000>;\n",
"+\t\t};\n",
@@ -59,4 +59,4 @@
"1.8.5.2"
]
-98c4344f37d4eca75b87d9c4ae44e0407fba215ba2ca613a0ffd08d1be6df5a6
+3fb8477f9d685b8a37c3171852362b5d9a973af216b8f8c94ba756075acb09ec
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.