diff for duplicates of <20160830100317.GQ1661@dell>

diff --git a/a/1.txt b/N1/1.txt
index 2c01a0a..f957bc9 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -24,7 +24,7 @@ s/14/15/
 > >  			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>;
@@ -43,7 +43,7 @@ s/14/15/
 > > +			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>;
@@ -62,7 +62,7 @@ s/14/15/
 > > +			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>;
@@ -81,7 +81,7 @@ s/14/15/
 > > +			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>;
@@ -106,5 +106,5 @@ s/14/15/
 -- 
 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 9cd2d49..5174b38 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,26 +1,10 @@
  "ref\01472223413-7254-1-git-send-email-peter.griffin@linaro.org\0"
  "ref\01472223413-7254-15-git-send-email-peter.griffin@linaro.org\0"
  "ref\020160830100258.GP1661@dell\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:03:17 +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 Tue, 30 Aug 2016, Lee Jones wrote:\n"
@@ -49,7 +33,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"
@@ -68,7 +52,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"
@@ -87,7 +71,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"
@@ -106,7 +90,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"
@@ -131,7 +115,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
 
-d1e776a7e4e33b148fd897c12b51343b267e6577ad4f621a31a69d18d0529b79
+38f6d7a06fc234a4eff0d7d0364b7ca483771076295378b9e5cf897d135de520
