diff for duplicates of <1473081421-16555-15-git-send-email-peter.griffin@linaro.org>
diff --git a/a/content_digest b/N1/content_digest
index f3e7012..89c8b64 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -23,14 +23,14 @@
" 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",
+ "Cc\0devicetree\@vger.kernel.org",
+ " Arnaud Pouliquen <arnaud.pouliquen\@st.com>",
" linux-remoteproc\@vger.kernel.org",
+ " dri-devel\@lists.freedesktop.org",
" virtualization\@lists.linux-foundation.org",
- " Arnaud Pouliquen <arnaud.pouliquen\@st.com>\0"
+ " peter.griffin\@linaro.org",
+ " dmaengine\@vger.kernel.org",
+ " lee.jones\@linaro.org\0"
]
[
"\0000:1\0"
@@ -142,4 +142,4 @@
"1.9.1"
]
-5ae241791ae003f174ed5daa080f66eedd8959c20ab39329f777eb901bbc8d66
+c90769f37134735219e2ff1f078999e1ae56122cb6284d743e1ef6833d6d1553
diff --git a/a/1.txt b/N2/1.txt
index bfc4d0e..308fb51 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -16,7 +16,7 @@ index d1258d5..1edc36c 100644
st,syscfg = <&syscfg_core>;
};
+
-+ sti_uni_player0: sti-uni-player@8d80000 {
++ sti_uni_player0: sti-uni-player at 8d80000 {
+ compatible = "st,sti-uni-player";
+ #sound-dai-cells = <0>;
+ st,syscfg = <&syscfg_core>;
@@ -36,7 +36,7 @@ index d1258d5..1edc36c 100644
+ status = "disabled";
+ };
+
-+ sti_uni_player1: sti-uni-player@8d81000 {
++ sti_uni_player1: sti-uni-player at 8d81000 {
+ compatible = "st,sti-uni-player";
+ #sound-dai-cells = <0>;
+ st,syscfg = <&syscfg_core>;
@@ -56,7 +56,7 @@ index d1258d5..1edc36c 100644
+ status = "disabled";
+ };
+
-+ sti_uni_player2: sti-uni-player@8d82000 {
++ sti_uni_player2: sti-uni-player at 8d82000 {
+ compatible = "st,sti-uni-player";
+ #sound-dai-cells = <0>;
+ st,syscfg = <&syscfg_core>;
@@ -76,7 +76,7 @@ index d1258d5..1edc36c 100644
+ status = "disabled";
+ };
+
-+ sti_uni_player3: sti-uni-player@8d85000 {
++ sti_uni_player3: sti-uni-player at 8d85000 {
+ compatible = "st,sti-uni-player";
+ #sound-dai-cells = <0>;
+ st,syscfg = <&syscfg_core>;
diff --git a/a/content_digest b/N2/content_digest
index f3e7012..a308d13 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\0001473081421-16555-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 v9 14/19] ARM: STi: DT: STiH407: Add uniperif player dt nodes\0"
@@ -11,26 +11,7 @@
"Date\0Mon, 5 Sep 2016 14:16:56 +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",
- " linux-remoteproc\@vger.kernel.org",
- " virtualization\@lists.linux-foundation.org",
- " Arnaud Pouliquen <arnaud.pouliquen\@st.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -57,7 +38,7 @@
" \t\t\tst,syscfg = <&syscfg_core>;\n",
" \t\t};\n",
"+\n",
- "+\t\tsti_uni_player0: sti-uni-player\@8d80000 {\n",
+ "+\t\tsti_uni_player0: sti-uni-player at 8d80000 {\n",
"+\t\t\tcompatible = \"st,sti-uni-player\";\n",
"+\t\t\t#sound-dai-cells = <0>;\n",
"+\t\t\tst,syscfg = <&syscfg_core>;\n",
@@ -77,7 +58,7 @@
"+\t\t\tstatus\t\t= \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tsti_uni_player1: sti-uni-player\@8d81000 {\n",
+ "+\t\tsti_uni_player1: sti-uni-player at 8d81000 {\n",
"+\t\t\tcompatible = \"st,sti-uni-player\";\n",
"+\t\t\t#sound-dai-cells = <0>;\n",
"+\t\t\tst,syscfg = <&syscfg_core>;\n",
@@ -97,7 +78,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tsti_uni_player2: sti-uni-player\@8d82000 {\n",
+ "+\t\tsti_uni_player2: sti-uni-player at 8d82000 {\n",
"+\t\t\tcompatible = \"st,sti-uni-player\";\n",
"+\t\t\t#sound-dai-cells = <0>;\n",
"+\t\t\tst,syscfg = <&syscfg_core>;\n",
@@ -117,7 +98,7 @@
"+\t\t\tstatus = \"disabled\";\n",
"+\t\t};\n",
"+\n",
- "+\t\tsti_uni_player3: sti-uni-player\@8d85000 {\n",
+ "+\t\tsti_uni_player3: sti-uni-player at 8d85000 {\n",
"+\t\t\tcompatible = \"st,sti-uni-player\";\n",
"+\t\t\t#sound-dai-cells = <0>;\n",
"+\t\t\tst,syscfg = <&syscfg_core>;\n",
@@ -142,4 +123,4 @@
"1.9.1"
]
-5ae241791ae003f174ed5daa080f66eedd8959c20ab39329f777eb901bbc8d66
+15706a2e34611752615c885e24c3280af226544e2f9539c13efa3e992366844b
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.