diff for duplicates of <fde8feefc489652749920f18123ad9e48b427c5e.1408492753.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index ffce23d..050df97 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -16,7 +16,7 @@ index 0f28921..146ed64 100644
<0 17 IRQ_TYPE_LEVEL_HIGH>;
};
-+ dmac0: dma-controller@e6700000 {
++ dmac0: dma-controller at e6700000 {
+ compatible = "renesas,rcar-dmac";
+ reg = <0 0xe6700000 0 0x20000>;
+ interrupts = <0 197 IRQ_TYPE_LEVEL_HIGH
@@ -46,7 +46,7 @@ index 0f28921..146ed64 100644
+ dma-channels = <15>;
+ };
+
-+ dmac1: dma-controller@e6720000 {
++ dmac1: dma-controller at e6720000 {
+ compatible = "renesas,rcar-dmac";
+ reg = <0 0xe6720000 0 0x20000>;
+ interrupts = <0 220 IRQ_TYPE_LEVEL_HIGH
@@ -77,7 +77,7 @@ index 0f28921..146ed64 100644
+ };
+
/* The memory map in the User's Manual maps the cores to bus numbers */
- i2c0: i2c@e6508000 {
+ i2c0: i2c at e6508000 {
#address-cells = <1>;
--
2.0.1
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 218d37d..b97ba54 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,13 +2,13 @@
"ref\0cover.1408492753.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 06/12] ARM: shmobile: r8a7791: Add DMAC devices to DT\0"
]
[
- "Date\0Wed, 20 Aug 2014 00:23:57 +0000\0"
+ "Date\0Wed, 20 Aug 2014 09:23:57 +0900\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -38,7 +38,7 @@
" \t\t\t <0 17 IRQ_TYPE_LEVEL_HIGH>;\n",
" \t};\n",
" \n",
- "+\tdmac0: dma-controller\@e6700000 {\n",
+ "+\tdmac0: dma-controller at e6700000 {\n",
"+\t\tcompatible = \"renesas,rcar-dmac\";\n",
"+\t\treg = <0 0xe6700000 0 0x20000>;\n",
"+\t\tinterrupts = <0 197 IRQ_TYPE_LEVEL_HIGH\n",
@@ -68,7 +68,7 @@
"+\t\tdma-channels = <15>;\n",
"+\t};\n",
"+\n",
- "+\tdmac1: dma-controller\@e6720000 {\n",
+ "+\tdmac1: dma-controller at e6720000 {\n",
"+\t\tcompatible = \"renesas,rcar-dmac\";\n",
"+\t\treg = <0 0xe6720000 0 0x20000>;\n",
"+\t\tinterrupts = <0 220 IRQ_TYPE_LEVEL_HIGH\n",
@@ -99,10 +99,10 @@
"+\t};\n",
"+\n",
" \t/* The memory map in the User's Manual maps the cores to bus numbers */\n",
- " \ti2c0: i2c\@e6508000 {\n",
+ " \ti2c0: i2c at e6508000 {\n",
" \t\t#address-cells = <1>;\n",
"-- \n",
"2.0.1"
]
-51ddfd25062157c8deec8fbd47ec93f14c88003a2bb6b2d1c3a4c6293c816dab
+9bdefba351599abb37b93947eb4be2679dc4f068b4a784c494775152412f002c
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.