diff for duplicates of <87egd4d8dq.fsf@free-electrons.com>

diff --git a/a/1.txt b/N1/1.txt
index a0e68b6..7907edc 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,6 +1,6 @@
 Hi Aaro,
  
- On sam., janv. 23 2016, Aaro Koskinen <aaro.koskinen-X3B1VOXEql0@public.gmane.org> wrote:
+ On sam., janv. 23 2016, Aaro Koskinen <aaro.koskinen@iki.fi> wrote:
 
 > Fix audio on kirkwood-openrd-client:
 >
@@ -8,7 +8,7 @@ Hi Aaro,
 >
 > 2) The probe fails because cs42l51 is missing #sound-dai-cells.
 >
-> 	/sound/simple-audio-card,codec: could not get #sound-dai-cells for /ocp@f1000000/i2c@11000/cs42l51@4a
+> 	/sound/simple-audio-card,codec: could not get #sound-dai-cells for /ocp at f1000000/i2c at 11000/cs42l51 at 4a
 > 	asoc-simple-card sound: parse error -22
 > 	asoc-simple-card: probe of sound failed with error -22
 >
@@ -20,8 +20,8 @@ Hi Aaro,
 >
 > 	asoc-simple-card sound: cs42l51-hifi <-> i2s mapping ok
 >
-> Reported-by: Rick Thomas <rbthomas-e+AXbWqSrlAAvxtiuMwx3w@public.gmane.org>
-> Signed-off-by: Aaro Koskinen <aaro.koskinen-X3B1VOXEql0@public.gmane.org>
+> Reported-by: Rick Thomas <rbthomas@pobox.com>
+> Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
 
 Applied on mvebu/dt with Reviewed-by tag from Andrew Lunn and Tested-by
 tag from Rick Thomas.
@@ -42,15 +42,15 @@ Gregory
 > @@ -20,6 +20,9 @@
 >  	compatible = "marvell,openrd-client", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood";
 >  
->  	ocp@f1000000 {
-> +		audio-controller@a0000 {
+>  	ocp at f1000000 {
+> +		audio-controller at a0000 {
 > +			status = "okay";
 > +		};
->  		i2c@11000 {
+>  		i2c at 11000 {
 >  			status = "okay";
 >  			clock-frequency = <400000>;
 > @@ -27,6 +30,7 @@
->  			cs42l51: cs42l51@4a {
+>  			cs42l51: cs42l51 at 4a {
 >  				compatible = "cirrus,cs42l51";
 >  				reg = <0x4a>;
 > +				#sound-dai-cells = <0>;
@@ -72,7 +72,7 @@ Gregory
 > +++ b/arch/arm/boot/dts/kirkwood.dtsi
 > @@ -381,7 +381,7 @@
 >  
->  		audio0: audio-controller@a0000 {
+>  		audio0: audio-controller at a0000 {
 >  			compatible = "marvell,kirkwood-audio";
 > -			#sound-dai-cells = <0>;
 > +			#sound-dai-cells = <1>;
@@ -85,7 +85,7 @@ Gregory
 >
 > _______________________________________________
 > linux-arm-kernel mailing list
-> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
+> linux-arm-kernel at lists.infradead.org
 > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
 -- 
@@ -93,7 +93,3 @@ Gregory Clement, Free Electrons
 Kernel, drivers, real-time and embedded Linux
 development, consulting, training and support.
 http://free-electrons.com
---
-To unsubscribe from this list: send the line "unsubscribe devicetree" in
-the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/a/content_digest b/N1/content_digest
index ff8562c..fb5e6d8 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,24 +1,14 @@
  "ref\01453588600-14831-1-git-send-email-aaro.koskinen@iki.fi\0"
  "ref\01453588600-14831-2-git-send-email-aaro.koskinen@iki.fi\0"
- "ref\01453588600-14831-2-git-send-email-aaro.koskinen-X3B1VOXEql0@public.gmane.org\0"
- "From\0Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0"
- "Subject\0Re: [PATCH 1/2] ARM: DTS: kirkwood-openrd-client: fix audio\0"
+ "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0"
+ "Subject\0[PATCH 1/2] ARM: DTS: kirkwood-openrd-client: fix audio\0"
  "Date\0Tue, 26 Jan 2016 09:58:57 +0100\0"
- "To\0Aaro Koskinen <aaro.koskinen-X3B1VOXEql0@public.gmane.org>\0"
- "Cc\0Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org>"
-  Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>
-  Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
-  Arnaud Pouliquen <arnaud.pouliquen-qxv4g6HH51o@public.gmane.org>
-  alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org
-  linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
-  devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  Martin Michlmayr <tbm-R+vWnYXSFMfQT0dZR+AlfA@public.gmane.org>
- " Rick Thomas <rbthomas-e+AXbWqSrlAAvxtiuMwx3w@public.gmane.org>\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Hi Aaro,\n"
  " \n"
- " On sam., janv. 23 2016, Aaro Koskinen <aaro.koskinen-X3B1VOXEql0@public.gmane.org> wrote:\n"
+ " On sam., janv. 23 2016, Aaro Koskinen <aaro.koskinen@iki.fi> wrote:\n"
  "\n"
  "> Fix audio on kirkwood-openrd-client:\n"
  ">\n"
@@ -26,7 +16,7 @@
  ">\n"
  "> 2) The probe fails because cs42l51 is missing #sound-dai-cells.\n"
  ">\n"
- "> \t/sound/simple-audio-card,codec: could not get #sound-dai-cells for /ocp@f1000000/i2c@11000/cs42l51@4a\n"
+ "> \t/sound/simple-audio-card,codec: could not get #sound-dai-cells for /ocp at f1000000/i2c at 11000/cs42l51 at 4a\n"
  "> \tasoc-simple-card sound: parse error -22\n"
  "> \tasoc-simple-card: probe of sound failed with error -22\n"
  ">\n"
@@ -38,8 +28,8 @@
  ">\n"
  "> \tasoc-simple-card sound: cs42l51-hifi <-> i2s mapping ok\n"
  ">\n"
- "> Reported-by: Rick Thomas <rbthomas-e+AXbWqSrlAAvxtiuMwx3w@public.gmane.org>\n"
- "> Signed-off-by: Aaro Koskinen <aaro.koskinen-X3B1VOXEql0@public.gmane.org>\n"
+ "> Reported-by: Rick Thomas <rbthomas@pobox.com>\n"
+ "> Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>\n"
  "\n"
  "Applied on mvebu/dt with Reviewed-by tag from Andrew Lunn and Tested-by\n"
  "tag from Rick Thomas.\n"
@@ -60,15 +50,15 @@
  "> @@ -20,6 +20,9 @@\n"
  ">  \tcompatible = \"marvell,openrd-client\", \"marvell,openrd\", \"marvell,kirkwood-88f6281\", \"marvell,kirkwood\";\n"
  ">  \n"
- ">  \tocp@f1000000 {\n"
- "> +\t\taudio-controller@a0000 {\n"
+ ">  \tocp at f1000000 {\n"
+ "> +\t\taudio-controller at a0000 {\n"
  "> +\t\t\tstatus = \"okay\";\n"
  "> +\t\t};\n"
- ">  \t\ti2c@11000 {\n"
+ ">  \t\ti2c at 11000 {\n"
  ">  \t\t\tstatus = \"okay\";\n"
  ">  \t\t\tclock-frequency = <400000>;\n"
  "> @@ -27,6 +30,7 @@\n"
- ">  \t\t\tcs42l51: cs42l51@4a {\n"
+ ">  \t\t\tcs42l51: cs42l51 at 4a {\n"
  ">  \t\t\t\tcompatible = \"cirrus,cs42l51\";\n"
  ">  \t\t\t\treg = <0x4a>;\n"
  "> +\t\t\t\t#sound-dai-cells = <0>;\n"
@@ -90,7 +80,7 @@
  "> +++ b/arch/arm/boot/dts/kirkwood.dtsi\n"
  "> @@ -381,7 +381,7 @@\n"
  ">  \n"
- ">  \t\taudio0: audio-controller@a0000 {\n"
+ ">  \t\taudio0: audio-controller at a0000 {\n"
  ">  \t\t\tcompatible = \"marvell,kirkwood-audio\";\n"
  "> -\t\t\t#sound-dai-cells = <0>;\n"
  "> +\t\t\t#sound-dai-cells = <1>;\n"
@@ -103,17 +93,13 @@
  ">\n"
  "> _______________________________________________\n"
  "> linux-arm-kernel mailing list\n"
- "> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\n"
+ "> linux-arm-kernel at lists.infradead.org\n"
  "> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\n"
  "\n"
  "-- \n"
  "Gregory Clement, Free Electrons\n"
  "Kernel, drivers, real-time and embedded Linux\n"
  "development, consulting, training and support.\n"
- "http://free-electrons.com\n"
- "--\n"
- "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n"
- "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n"
- More majordomo info at  http://vger.kernel.org/majordomo-info.html
+ http://free-electrons.com
 
-713d9c70634f108139aadcbbf66fa16285f632e0b23c12fc76bfe111726917a3
+947949ab9cc95dcbb4906435b62b9c2c6348382fd4458b79e5eb59d34fdc9d1c
