diff for duplicates of <469352ad3c43e689c15cd396cbb750ee831ab63e.1447981420.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index 719529c..ce2e7b1 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -27,7 +27,7 @@ index 187a82dc7d9f..aa9b64c14a09 100644
status = "disabled";
};
-+ qspi: spi@e6b10000 {
++ qspi: spi at e6b10000 {
+ compatible = "renesas,qspi-r8a7793", "renesas,qspi";
+ reg = <0 0xe6b10000 0 0x2c>;
+ interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;
@@ -48,7 +48,7 @@ index 187a82dc7d9f..aa9b64c14a09 100644
"ipmmu_sgx", "vin2", "vin1", "vin0", "ether",
"sata1", "sata0";
};
-+ mstp9_clks: mstp9_clks@e6150994 {
++ mstp9_clks: mstp9_clks at e6150994 {
+ compatible = "renesas,r8a7793-mstp-clocks", "renesas,cpg-mstp-clocks";
+ reg = <0 0xe6150994 0 4>, <0 0xe61509a4 0 4>;
+ clocks = <&cpg_clocks R8A7793_CLK_QSPI>;
@@ -58,6 +58,6 @@ index 187a82dc7d9f..aa9b64c14a09 100644
+ };
};
- ipmmu_sy0: mmu@e6280000 {
+ ipmmu_sy0: mmu at e6280000 {
--
2.1.4
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 2bcce19..17595e0 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 17/29] ARM: shmobile: r8a7793: Add QSPI device to DT\0"
]
[
- "Date\0Fri, 20 Nov 2015 01:05:24 +0000\0"
+ "Date\0Thu, 19 Nov 2015 17:05:24 -0800\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -49,7 +49,7 @@
" \t\tstatus = \"disabled\";\n",
" \t};\n",
" \n",
- "+\tqspi: spi\@e6b10000 {\n",
+ "+\tqspi: spi at e6b10000 {\n",
"+\t\tcompatible = \"renesas,qspi-r8a7793\", \"renesas,qspi\";\n",
"+\t\treg = <0 0xe6b10000 0 0x2c>;\n",
"+\t\tinterrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -70,7 +70,7 @@
" \t\t\t\t\"ipmmu_sgx\", \"vin2\", \"vin1\", \"vin0\", \"ether\",\n",
" \t\t\t\t\"sata1\", \"sata0\";\n",
" \t\t};\n",
- "+\t\tmstp9_clks: mstp9_clks\@e6150994 {\n",
+ "+\t\tmstp9_clks: mstp9_clks at e6150994 {\n",
"+\t\t\tcompatible = \"renesas,r8a7793-mstp-clocks\", \"renesas,cpg-mstp-clocks\";\n",
"+\t\t\treg = <0 0xe6150994 0 4>, <0 0xe61509a4 0 4>;\n",
"+\t\t\tclocks = <&cpg_clocks R8A7793_CLK_QSPI>;\n",
@@ -80,9 +80,9 @@
"+\t\t};\n",
" \t};\n",
" \n",
- " \tipmmu_sy0: mmu\@e6280000 {\n",
+ " \tipmmu_sy0: mmu at e6280000 {\n",
"-- \n",
"2.1.4"
]
-5d9179cbf1078e109093ac3ff2c98b15a8471b22eecdc06a2d5830e2a722d578
+e3db9eac99888afbca8fada65dd987a0b12cfe668e042b89d32a4f479d4972b8
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.