diff for duplicates of <20150320132646.GH4802@kwain>

diff --git a/a/1.txt b/N1/1.txt
index 6dd7e6b..38ad339 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -8,21 +8,21 @@ On Tue, Mar 03, 2015 at 10:32:24AM +0100, Linus Walleij wrote:
 > to make a small writeup on MFD devices and add the compatible definition
 > there.
 > 
-> Suggested-by: Lee Jones <lee.jones@linaro.org>
-> Cc: Arnd Bergmann <arnd@arndb.de>
-> Cc: Devicetree <devicetree@vger.kernel.org>
-> Cc: Rob Herring <robh+dt@kernel.org>
-> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-> Cc: Grant Likely <grant.likely@linaro.org>
-> Cc: Pawel Moll <pawel.moll@arm.com>
-> Cc: Mark Rutland <mark.rutland@arm.com>
-> Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
-> Cc: Kumar Gala <galak@codeaurora.org>
-> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+> Suggested-by: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
+> Cc: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>
+> Cc: Devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
+> Cc: Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
+> Cc: Benjamin Herrenschmidt <benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>
+> Cc: Grant Likely <grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
+> Cc: Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org>
+> Cc: Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>
+> Cc: Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org>
+> Cc: Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
+> Signed-off-by: Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
 
 Since I'm also using this,
 
-Acked-by: Antoine Tenart <antoine.tenart@free-electrons.com>
+Acked-by: Antoine Tenart <antoine.tenart-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
 
 > ---
 > I make the patch to the OF core in this one, it makes much more sense since
@@ -78,11 +78,11 @@ Acked-by: Antoine Tenart <antoine.tenart@free-electrons.com>
 > +
 > +Example:
 > +
-> +foo at 1000 {
+> +foo@1000 {
 > +		compatible = "syscon", "simple-mfd";
 > +		reg = <0x010000 0x1000>;
 > +
-> +		led at 08.0 {
+> +		led@08.0 {
 > +			compatible = "register-bit-led";
 > +			offset = <0x08>;
 > +			mask = <0x01>;
@@ -108,10 +108,14 @@ Acked-by: Antoine Tenart <antoine.tenart@free-electrons.com>
 > 
 > _______________________________________________
 > linux-arm-kernel mailing list
-> linux-arm-kernel at lists.infradead.org
+> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
 > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
 -- 
-Antoine T?nart, Free Electrons
+Antoine Ténart, Free Electrons
 Embedded Linux, Kernel and Android engineering
 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 4b7ad63..1f17fdf 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,25 @@
  "ref\01425375148-4369-1-git-send-email-linus.walleij@linaro.org\0"
  "ref\01425375148-4369-2-git-send-email-linus.walleij@linaro.org\0"
- "From\0antoine.tenart@free-electrons.com (Antoine Tenart)\0"
- "Subject\0[PATCH 1/5] MFD/OF: document MFD devices and handle simple-mfd\0"
+ "ref\01425375148-4369-2-git-send-email-linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org\0"
+ "From\0Antoine Tenart <antoine.tenart-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0"
+ "Subject\0Re: [PATCH 1/5] MFD/OF: document MFD devices and handle simple-mfd\0"
  "Date\0Fri, 20 Mar 2015 14:26:46 +0100\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0"
+ "Cc\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org"
+  Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>
+  Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
+  Bryan Wu <cooloney-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
+  Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>
+  Devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
+  Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org>
+  Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org>
+  Catalin Marinas <catalin.marinas-5wv7dgnIgG8@public.gmane.org>
+  Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
+  Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>
+  Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
+  Richard Purdie <rpurdie-Fm38FmjxZ/leoWH0uzbU5w@public.gmane.org>
+  Benjamin Herrenschmidt <benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>
+ " Grant Likely <grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0"
  "\00:1\0"
  "b\0"
  "On Tue, Mar 03, 2015 at 10:32:24AM +0100, Linus Walleij wrote:\n"
@@ -16,21 +32,21 @@
  "> to make a small writeup on MFD devices and add the compatible definition\n"
  "> there.\n"
  "> \n"
- "> Suggested-by: Lee Jones <lee.jones@linaro.org>\n"
- "> Cc: Arnd Bergmann <arnd@arndb.de>\n"
- "> Cc: Devicetree <devicetree@vger.kernel.org>\n"
- "> Cc: Rob Herring <robh+dt@kernel.org>\n"
- "> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>\n"
- "> Cc: Grant Likely <grant.likely@linaro.org>\n"
- "> Cc: Pawel Moll <pawel.moll@arm.com>\n"
- "> Cc: Mark Rutland <mark.rutland@arm.com>\n"
- "> Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>\n"
- "> Cc: Kumar Gala <galak@codeaurora.org>\n"
- "> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>\n"
+ "> Suggested-by: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n"
+ "> Cc: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>\n"
+ "> Cc: Devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>\n"
+ "> Cc: Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\n"
+ "> Cc: Benjamin Herrenschmidt <benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>\n"
+ "> Cc: Grant Likely <grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n"
+ "> Cc: Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org>\n"
+ "> Cc: Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>\n"
+ "> Cc: Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org>\n"
+ "> Cc: Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\n"
+ "> Signed-off-by: Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n"
  "\n"
  "Since I'm also using this,\n"
  "\n"
- "Acked-by: Antoine Tenart <antoine.tenart@free-electrons.com>\n"
+ "Acked-by: Antoine Tenart <antoine.tenart-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\n"
  "\n"
  "> ---\n"
  "> I make the patch to the OF core in this one, it makes much more sense since\n"
@@ -86,11 +102,11 @@
  "> +\n"
  "> +Example:\n"
  "> +\n"
- "> +foo at 1000 {\n"
+ "> +foo@1000 {\n"
  "> +\t\tcompatible = \"syscon\", \"simple-mfd\";\n"
  "> +\t\treg = <0x010000 0x1000>;\n"
  "> +\n"
- "> +\t\tled at 08.0 {\n"
+ "> +\t\tled@08.0 {\n"
  "> +\t\t\tcompatible = \"register-bit-led\";\n"
  "> +\t\t\toffset = <0x08>;\n"
  "> +\t\t\tmask = <0x01>;\n"
@@ -116,12 +132,16 @@
  "> \n"
  "> _______________________________________________\n"
  "> linux-arm-kernel mailing list\n"
- "> linux-arm-kernel at lists.infradead.org\n"
+ "> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\n"
  "> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\n"
  "\n"
  "-- \n"
- "Antoine T?nart, Free Electrons\n"
+ "Antoine T\303\251nart, Free Electrons\n"
  "Embedded Linux, Kernel and Android engineering\n"
- http://free-electrons.com
+ "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
 
-c9b913c50fdf2546cd54fac317b79dc6289a619aef1e62b36ab433a5894a54b2
+bab757926ac021f825d9776950b23e80d7c25e9d346a15d8dfdddc93c506a234
