diff for duplicates of <20160830095646.GM1661@dell>

diff --git a/a/1.txt b/N1/1.txt
index ccaa566..720d740 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -21,11 +21,11 @@ Acked-by: Lee Jones <lee.jones@linaro.org>
 >  			};
 >  		};
 > +
-> +		sti_uni_player2: sti-uni-player@2 {
+> +		sti_uni_player2: sti-uni-player at 2 {
 > +			status = "okay";
 > +		};
 > +
-> +		sti_uni_player3: sti-uni-player@3 {
+> +		sti_uni_player3: sti-uni-player at 3 {
 > +			status = "okay";
 > +		};
 > +
@@ -40,7 +40,7 @@ Acked-by: Lee Jones <lee.jones@linaro.org>
 > +			simple-audio-card,name = "sti audio card";
 > +			status = "okay";
 > +
-> +			simple-audio-card,dai-link@0 {
+> +			simple-audio-card,dai-link at 0 {
 > +				/* DAC */
 > +				format = "i2s";
 > +				mclk-fs = <256>;
@@ -52,7 +52,7 @@ Acked-by: Lee Jones <lee.jones@linaro.org>
 > +					sound-dai = <&sti_sasg_codec 1>;
 > +				};
 > +			};
-> +			simple-audio-card,dai-link@1 {
+> +			simple-audio-card,dai-link at 1 {
 > +				/* SPDIF */
 > +				format = "left_j";
 > +				mclk-fs = <128>;
@@ -71,5 +71,5 @@ Acked-by: Lee Jones <lee.jones@linaro.org>
 -- 
 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 e61b7cd..1f6e93d 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-17-git-send-email-peter.griffin@linaro.org\0"
- "From\0Lee Jones <lee.jones@linaro.org>\0"
- "Subject\0Re: [PATCH v8 16/18] ARM: DT: STi: stihxxx-b2120: Add DT nodes for STi audio card\0"
+ "From\0lee.jones@linaro.org (Lee Jones)\0"
+ "Subject\0[PATCH v8 16/18] ARM: DT: STi: stihxxx-b2120: Add DT nodes for STi audio card\0"
  "Date\0Tue, 30 Aug 2016 10:56:46 +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"
@@ -45,11 +29,11 @@
  ">  \t\t\t};\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\tstatus = \"okay\";\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\tstatus = \"okay\";\n"
  "> +\t\t};\n"
  "> +\n"
@@ -64,7 +48,7 @@
  "> +\t\t\tsimple-audio-card,name = \"sti audio card\";\n"
  "> +\t\t\tstatus = \"okay\";\n"
  "> +\n"
- "> +\t\t\tsimple-audio-card,dai-link@0 {\n"
+ "> +\t\t\tsimple-audio-card,dai-link at 0 {\n"
  "> +\t\t\t\t/* DAC */\n"
  "> +\t\t\t\tformat = \"i2s\";\n"
  "> +\t\t\t\tmclk-fs = <256>;\n"
@@ -76,7 +60,7 @@
  "> +\t\t\t\t\tsound-dai = <&sti_sasg_codec 1>;\n"
  "> +\t\t\t\t};\n"
  "> +\t\t\t};\n"
- "> +\t\t\tsimple-audio-card,dai-link@1 {\n"
+ "> +\t\t\tsimple-audio-card,dai-link at 1 {\n"
  "> +\t\t\t\t/* SPDIF */\n"
  "> +\t\t\t\tformat = \"left_j\";\n"
  "> +\t\t\t\tmclk-fs = <128>;\n"
@@ -95,7 +79,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
 
-01024920bf62a3596dd50657de439810fd0653ec37641483d3f40af4bf77f7ce
+80691e89915116113cf444fc71d9081535f145f48a4d3a119a62150ad77a67b9
