diff for duplicates of <bf2ca657f1fc280531eb62d56467c259125d26ff.1512640145.git.horms+renesas@verge.net.au>
diff --git a/a/1.txt b/N1/1.txt
index bbaf9c9..5ba982f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -29,7 +29,7 @@ index 1a091bb41b7f..af200aa55fce 100644
+ <&ipmmu_ds0 14>, <&ipmmu_ds0 15>;
};
- dmac1: dma-controller@e7300000 {
+ dmac1: dma-controller at e7300000 {
@@ -632,6 +640,14 @@
resets = <&cpg 218>;
#dma-cells = <1>;
@@ -44,7 +44,7 @@ index 1a091bb41b7f..af200aa55fce 100644
+ <&ipmmu_ds1 14>, <&ipmmu_ds1 15>;
};
- dmac2: dma-controller@e7310000 {
+ dmac2: dma-controller at e7310000 {
@@ -666,6 +682,14 @@
resets = <&cpg 217>;
#dma-cells = <1>;
@@ -59,6 +59,6 @@ index 1a091bb41b7f..af200aa55fce 100644
+ <&ipmmu_ds1 30>, <&ipmmu_ds1 31>;
};
- audma0: dma-controller@ec700000 {
+ audma0: dma-controller at ec700000 {
--
2.11.0
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 2ff4ff7..a681162 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\0cover.1512640145.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 21/54] arm64: dts: renesas: r8a7795: Tie SYS-DMAC to IPMMU-DS0/1\0"
@@ -11,13 +11,7 @@
"Date\0Thu, 7 Dec 2017 10:53:24 +0100\0"
]
[
- "To\0linux-renesas-soc\@vger.kernel.org\0"
-]
-[
- "Cc\0linux-arm-kernel\@lists.infradead.org",
- " Magnus Damm <magnus.damm\@gmail.com>",
- " Magnus Damm <damm+renesas\@opensource.se>",
- " Simon Horman <horms+renesas\@verge.net.au>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -57,7 +51,7 @@
"+\t\t\t <&ipmmu_ds0 14>, <&ipmmu_ds0 15>;\n",
" \t\t};\n",
" \n",
- " \t\tdmac1: dma-controller\@e7300000 {\n",
+ " \t\tdmac1: dma-controller at e7300000 {\n",
"\@\@ -632,6 +640,14 \@\@\n",
" \t\t\tresets = <&cpg 218>;\n",
" \t\t\t#dma-cells = <1>;\n",
@@ -72,7 +66,7 @@
"+\t\t\t <&ipmmu_ds1 14>, <&ipmmu_ds1 15>;\n",
" \t\t};\n",
" \n",
- " \t\tdmac2: dma-controller\@e7310000 {\n",
+ " \t\tdmac2: dma-controller at e7310000 {\n",
"\@\@ -666,6 +682,14 \@\@\n",
" \t\t\tresets = <&cpg 217>;\n",
" \t\t\t#dma-cells = <1>;\n",
@@ -87,9 +81,9 @@
"+\t\t\t <&ipmmu_ds1 30>, <&ipmmu_ds1 31>;\n",
" \t\t};\n",
" \n",
- " \t\taudma0: dma-controller\@ec700000 {\n",
+ " \t\taudma0: dma-controller at ec700000 {\n",
"-- \n",
"2.11.0"
]
-0a4decbb981fcefc240b04aa50b817c612b2049ed634d3c189333c14e103b7b2
+0185c5997dd0053b61014643570c98ca65a8d26ec65d4226175ec23f738c295f
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.