diff for duplicates of <1472223413-7254-7-git-send-email-peter.griffin@linaro.org>
diff --git a/a/content_digest b/N1/content_digest
index 242157f..12760ca 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -23,13 +23,13 @@
" bjorn.andersson\@linaro.org\0"
]
[
- "Cc\0peter.griffin\@linaro.org",
- " lee.jones\@linaro.org",
- " dmaengine\@vger.kernel.org",
- " devicetree\@vger.kernel.org",
+ "Cc\0devicetree\@vger.kernel.org",
+ " linux-remoteproc\@vger.kernel.org",
" dri-devel\@lists.freedesktop.org",
" virtualization\@lists.linux-foundation.org",
- " linux-remoteproc\@vger.kernel.org\0"
+ " peter.griffin\@linaro.org",
+ " dmaengine\@vger.kernel.org",
+ " lee.jones\@linaro.org\0"
]
[
"\0000:1\0"
@@ -112,4 +112,4 @@
"1.9.1"
]
-a1cb7db31c79114129637e0ed0b2f1d6b5f85bf0c3de3ea90746a23dddb76081
+4a4f74fc7c66610633fd16347e246be4913d73bd2919062182af772c2cb87fb7
diff --git a/a/1.txt b/N2/1.txt
index d9c2ce5..a1b2bc0 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -16,7 +16,7 @@ index d294e82..45cab30 100644
};
+
+ /* fdma audio */
-+ fdma0: dma-controller@8e20000 {
++ fdma0: dma-controller at 8e20000 {
+ compatible = "st,stih407-fdma-mpe31-11", "st,slim-rproc";
+ reg = <0x8e20000 0x8000>,
+ <0x8e30000 0x3000>,
@@ -33,7 +33,7 @@ index d294e82..45cab30 100644
+ };
+
+ /* fdma app */
-+ fdma1: dma-controller@8e40000 {
++ fdma1: dma-controller at 8e40000 {
+ compatible = "st,stih407-fdma-mpe31-12", "st,slim-rproc";
+ reg = <0x8e40000 0x8000>,
+ <0x8e50000 0x3000>,
@@ -51,7 +51,7 @@ index d294e82..45cab30 100644
+ };
+
+ /* fdma free running */
-+ fdma2: dma-controller@8e60000 {
++ fdma2: dma-controller at 8e60000 {
+ compatible = "st,stih407-fdma-mpe31-13", "st,slim-rproc";
+ reg = <0x8e60000 0x8000>,
+ <0x8e70000 0x3000>,
diff --git a/a/content_digest b/N2/content_digest
index 242157f..fd93183 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\0001472223413-7254-1-git-send-email-peter.griffin\@linaro.org\0"
]
[
- "From\0Peter Griffin <peter.griffin\@linaro.org>\0"
+ "From\0peter.griffin\@linaro.org (Peter Griffin)\0"
]
[
"Subject\0[PATCH v8 06/18] ARM: STi: DT: STiH407: Add FDMA driver dt nodes.\0"
@@ -11,25 +11,7 @@
"Date\0Fri, 26 Aug 2016 15:56:41 +0100\0"
]
[
- "To\0linux-arm-kernel\@lists.infradead.org",
- " linux-kernel\@vger.kernel.org",
- " kernel\@stlinux.com",
- " vinod.koul\@intel.com",
- " patrice.chotard\@st.com",
- " dan.j.williams\@intel.com",
- " airlied\@linux.ie",
- " kraxel\@redhat.com",
- " ohad\@wizery.com",
- " bjorn.andersson\@linaro.org\0"
-]
-[
- "Cc\0peter.griffin\@linaro.org",
- " lee.jones\@linaro.org",
- " dmaengine\@vger.kernel.org",
- " devicetree\@vger.kernel.org",
- " dri-devel\@lists.freedesktop.org",
- " virtualization\@lists.linux-foundation.org",
- " linux-remoteproc\@vger.kernel.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -56,7 +38,7 @@
" \t\t};\n",
"+\n",
"+\t\t/* fdma audio */\n",
- "+\t\tfdma0: dma-controller\@8e20000 {\n",
+ "+\t\tfdma0: dma-controller at 8e20000 {\n",
"+\t\t\tcompatible = \"st,stih407-fdma-mpe31-11\", \"st,slim-rproc\";\n",
"+\t\t\treg = <0x8e20000 0x8000>,\n",
"+\t\t\t <0x8e30000 0x3000>,\n",
@@ -73,7 +55,7 @@
"+\t\t};\n",
"+\n",
"+\t\t/* fdma app */\n",
- "+\t\tfdma1: dma-controller\@8e40000 {\n",
+ "+\t\tfdma1: dma-controller at 8e40000 {\n",
"+\t\t\tcompatible = \"st,stih407-fdma-mpe31-12\", \"st,slim-rproc\";\n",
"+\t\t\treg = <0x8e40000 0x8000>,\n",
"+\t\t\t <0x8e50000 0x3000>,\n",
@@ -91,7 +73,7 @@
"+\t\t};\n",
"+\n",
"+\t\t/* fdma free running */\n",
- "+\t\tfdma2: dma-controller\@8e60000 {\n",
+ "+\t\tfdma2: dma-controller at 8e60000 {\n",
"+\t\t\tcompatible = \"st,stih407-fdma-mpe31-13\", \"st,slim-rproc\";\n",
"+\t\t\treg = <0x8e60000 0x8000>,\n",
"+\t\t\t <0x8e70000 0x3000>,\n",
@@ -112,4 +94,4 @@
"1.9.1"
]
-a1cb7db31c79114129637e0ed0b2f1d6b5f85bf0c3de3ea90746a23dddb76081
+0f5dab2f74114dcb639cb116d537586c4ca9cfe115c6f7731e06d5ff19bc59fb
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.