diff for duplicates of <fad6d45cdf8269d6d1c6784792c74c53e2304b32.1398216022.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index 4d11a12..91ee73a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -48,8 +48,8 @@ index 618e5b5..9383b84 100644
};
};
-- spi: spi@e6b10000 {
-+ qspi: spi@e6b10000 {
+- spi: spi at e6b10000 {
++ qspi: spi at e6b10000 {
compatible = "renesas,qspi-r8a7790", "renesas,qspi";
reg = <0 0xe6b10000 0 0x2c>;
interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/a/content_digest b/N1/content_digest
index 915e94c..4958233 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 02/33] ARM: shmobile: r8a7790/lager dts: Rename label spi to qspi, add spi0 alias\0"
]
[
- "Date\0Wed, 23 Apr 2014 01:25:30 +0000\0"
+ "Date\0Wed, 23 Apr 2014 10:25:30 +0900\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -70,8 +70,8 @@
" \t\t};\n",
" \t};\n",
" \n",
- "-\tspi: spi\@e6b10000 {\n",
- "+\tqspi: spi\@e6b10000 {\n",
+ "-\tspi: spi at e6b10000 {\n",
+ "+\tqspi: spi at e6b10000 {\n",
" \t\tcompatible = \"renesas,qspi-r8a7790\", \"renesas,qspi\";\n",
" \t\treg = <0 0xe6b10000 0 0x2c>;\n",
" \t\tinterrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;\n",
@@ -79,4 +79,4 @@
"1.8.5.2"
]
-546adc5cb8b5006b5515b63bbf12c0e0adec5aac72ab12cf6159536e1ab4c580
+e7add188e899b0b4b9f14ca4ab178241ad1a1ccc6e6614a6cedfa2ac084a50ec
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.