diff for duplicates of <20160830100258.GP1661@dell>

diff --git a/a/1.txt b/N1/1.txt
index 4957817..55ba87c 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -20,7 +20,7 @@ Same comments as in patch 14.
 >  			st,syscfg = <&syscfg_core>;
 >  		};
 > +
-> +		sti_uni_player0: sti-uni-player@0 {
+> +		sti_uni_player0: sti-uni-player at 0 {
 > +			compatible = "st,sti-uni-player";
 > +			status = "disabled";
 > +			#sound-dai-cells = <0>;
@@ -39,7 +39,7 @@ Same comments as in patch 14.
 > +			st,mode = "HDMI";
 > +		};
 > +
-> +		sti_uni_player1: sti-uni-player@1 {
+> +		sti_uni_player1: sti-uni-player at 1 {
 > +			compatible = "st,sti-uni-player";
 > +			status = "disabled";
 > +			#sound-dai-cells = <0>;
@@ -58,7 +58,7 @@ Same comments as in patch 14.
 > +			st,mode = "PCM";
 > +		};
 > +
-> +		sti_uni_player2: sti-uni-player@2 {
+> +		sti_uni_player2: sti-uni-player at 2 {
 > +			compatible = "st,sti-uni-player";
 > +			status = "disabled";
 > +			#sound-dai-cells = <0>;
@@ -77,7 +77,7 @@ Same comments as in patch 14.
 > +			st,mode = "PCM";
 > +		};
 > +
-> +		sti_uni_player3: sti-uni-player@3 {
+> +		sti_uni_player3: sti-uni-player at 3 {
 > +			compatible = "st,sti-uni-player";
 > +			status = "disabled";
 > +			#sound-dai-cells = <0>;
@@ -101,5 +101,5 @@ Same comments as in patch 14.
 -- 
 Lee Jones
 Linaro STMicroelectronics Landing Team Lead
-Linaro.org │ Open source software for ARM SoCs
+Linaro.org ? Open source software for ARM SoCs
 Follow Linaro: Facebook | Twitter | Blog
diff --git a/a/content_digest b/N1/content_digest
index 1015d6d..ecc3022 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,25 +1,9 @@
  "ref\01472223413-7254-1-git-send-email-peter.griffin@linaro.org\0"
  "ref\01472223413-7254-15-git-send-email-peter.griffin@linaro.org\0"
- "From\0Lee Jones <lee.jones@linaro.org>\0"
- "Subject\0Re: [PATCH v8 14/18] ARM: STi: DT: STiH407: Add uniperif player dt nodes\0"
+ "From\0lee.jones@linaro.org (Lee Jones)\0"
+ "Subject\0[PATCH v8 14/18] ARM: STi: DT: STiH407: Add uniperif player dt nodes\0"
  "Date\0Tue, 30 Aug 2016 11:02:58 +0100\0"
- "To\0Peter Griffin <peter.griffin@linaro.org>\0"
- "Cc\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
-  dmaengine@vger.kernel.org
-  devicetree@vger.kernel.org
-  dri-devel@lists.freedesktop.org
-  virtualization@lists.linux-foundation.org
-  linux-remoteproc@vger.kernel.org
- " Arnaud Pouliquen <arnaud.pouliquen@st.com>\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Fri, 26 Aug 2016, Peter Griffin wrote:\n"
@@ -44,7 +28,7 @@
  ">  \t\t\tst,syscfg = <&syscfg_core>;\n"
  ">  \t\t};\n"
  "> +\n"
- "> +\t\tsti_uni_player0: sti-uni-player@0 {\n"
+ "> +\t\tsti_uni_player0: sti-uni-player at 0 {\n"
  "> +\t\t\tcompatible = \"st,sti-uni-player\";\n"
  "> +\t\t\tstatus = \"disabled\";\n"
  "> +\t\t\t#sound-dai-cells = <0>;\n"
@@ -63,7 +47,7 @@
  "> +\t\t\tst,mode = \"HDMI\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tsti_uni_player1: sti-uni-player@1 {\n"
+ "> +\t\tsti_uni_player1: sti-uni-player at 1 {\n"
  "> +\t\t\tcompatible = \"st,sti-uni-player\";\n"
  "> +\t\t\tstatus = \"disabled\";\n"
  "> +\t\t\t#sound-dai-cells = <0>;\n"
@@ -82,7 +66,7 @@
  "> +\t\t\tst,mode = \"PCM\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tsti_uni_player2: sti-uni-player@2 {\n"
+ "> +\t\tsti_uni_player2: sti-uni-player at 2 {\n"
  "> +\t\t\tcompatible = \"st,sti-uni-player\";\n"
  "> +\t\t\tstatus = \"disabled\";\n"
  "> +\t\t\t#sound-dai-cells = <0>;\n"
@@ -101,7 +85,7 @@
  "> +\t\t\tst,mode = \"PCM\";\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tsti_uni_player3: sti-uni-player@3 {\n"
+ "> +\t\tsti_uni_player3: sti-uni-player at 3 {\n"
  "> +\t\t\tcompatible = \"st,sti-uni-player\";\n"
  "> +\t\t\tstatus = \"disabled\";\n"
  "> +\t\t\t#sound-dai-cells = <0>;\n"
@@ -125,7 +109,7 @@
  "-- \n"
  "Lee Jones\n"
  "Linaro STMicroelectronics Landing Team Lead\n"
- "Linaro.org \342\224\202 Open source software for ARM SoCs\n"
+ "Linaro.org ? Open source software for ARM SoCs\n"
  Follow Linaro: Facebook | Twitter | Blog
 
-7431c34e7caf50d64483bef64de3dcab2663ddaa2bcd55395d715e5da984baa8
+50acb52eead09f94384e5fbcb451b3ebfbc32b7ac4301ecb6a9e0519766b39c9
