diff for duplicates of <20110826091608.GA3926@pulham.picochip.com>

diff --git a/a/1.txt b/N1/1.txt
index 2a12e23..395f97a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,17 +1,17 @@
 Hi Stephen,
 
 On Thu, Aug 25, 2011 at 05:43:41PM -0600, Stephen Warren wrote:
-> From: Jamie Iles <jamie-wmLquQDDieKakBO8gow8eQ@public.gmane.org>
+> From: Jamie Iles <jamie@jamieiles.com>
 > 
 > This patch adds a helper function of_pinmux_parse() that can be used to
 > extract common pinmux configuration to avoid each platform implementing
 > a parsing loop.  Platforms supply the node containing the pinmux
 > definitions and a platform specific callback for configuring a pingroup.
 > 
-> Signed-off-by: Jamie Iles <jamie-wmLquQDDieKakBO8gow8eQ@public.gmane.org>
+> Signed-off-by: Jamie Iles <jamie@jamieiles.com>
 > [swarren: Added support for pins property, added parse() callback, use
 >  dev_err instead of pr_err, related minor changes]
-> Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
+> Signed-off-by: Stephen Warren <swarren@nvidia.com>
 > ---
 >  drivers/of/Kconfig        |    5 ++
 >  drivers/of/Makefile       |    1 +
diff --git a/a/content_digest b/N1/content_digest
index f848cdd..4432c61 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,10 +5,7 @@
   "ref\0001314315824-9687-11-git-send-email-swarren\@nvidia.com\0"
 ]
 [
-  "ref\0001314315824-9687-11-git-send-email-swarren-DDmLM1+adcrQT0dZR+AlfA\@public.gmane.org\0"
-]
-[
-  "From\0Jamie Iles <jamie-wmLquQDDieKakBO8gow8eQ\@public.gmane.org>\0"
+  "From\0Jamie Iles <jamie\@jamieiles.com>\0"
 ]
 [
   "Subject\0Re: [PATCH v3 10/13] of: add a generic pinmux helper\0"
@@ -17,24 +14,24 @@
   "Date\0Fri, 26 Aug 2011 10:16:08 +0100\0"
 ]
 [
-  "To\0Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA\@public.gmane.org>\0"
+  "To\0Stephen Warren <swarren\@nvidia.com>\0"
 ]
 [
-  "Cc\0Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ\@public.gmane.org>",
-  " Colin Cross <ccross-z5hGa2qSFaRBDgjK7y7TUQ\@public.gmane.org>",
-  " Erik Gilling <konkers-z5hGa2qSFaRBDgjK7y7TUQ\@public.gmane.org>",
-  " Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w\@public.gmane.org>",
-  " Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ\@public.gmane.org>",
-  " Arnd Bergmann <arnd-r2nGTMty4D4\@public.gmane.org>",
-  " devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ\@public.gmane.org",
-  " linux-tegra-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
-  " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org",
-  " linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
-  " Belisko Marek <marek.belisko-Re5JQEeQqe8AvxtiuMwx3w\@public.gmane.org>",
-  " Jamie Iles <jamie-wmLquQDDieKakBO8gow8eQ\@public.gmane.org>",
-  " Shawn Guo <shawn.guo-KZfg59tc24xl57MIdRCFDg\@public.gmane.org>",
-  " Sergei Shtylyov <sshtylyov-Igf4POYTYCDQT0dZR+AlfA\@public.gmane.org>",
-  " Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>\0"
+  "Cc\0Grant Likely <grant.likely\@secretlab.ca>",
+  " Colin Cross <ccross\@android.com>",
+  " Erik Gilling <konkers\@android.com>",
+  " Olof Johansson <olof\@lixom.net>",
+  " Russell King <linux\@arm.linux.org.uk>",
+  " Arnd Bergmann <arnd\@arndb.de>",
+  " devicetree-discuss\@lists.ozlabs.org",
+  " linux-tegra\@vger.kernel.org",
+  " linux-arm-kernel\@lists.infradead.org",
+  " linux-kernel\@vger.kernel.org",
+  " Belisko Marek <marek.belisko\@gmail.com>",
+  " Jamie Iles <jamie\@jamieiles.com>",
+  " Shawn Guo <shawn.guo\@freescale.com>",
+  " Sergei Shtylyov <sshtylyov\@mvista.com>",
+  " Linus Walleij <linus.walleij\@linaro.org>\0"
 ]
 [
   "\0000:1\0"
@@ -46,17 +43,17 @@
   "Hi Stephen,\n",
   "\n",
   "On Thu, Aug 25, 2011 at 05:43:41PM -0600, Stephen Warren wrote:\n",
-  "> From: Jamie Iles <jamie-wmLquQDDieKakBO8gow8eQ\@public.gmane.org>\n",
+  "> From: Jamie Iles <jamie\@jamieiles.com>\n",
   "> \n",
   "> This patch adds a helper function of_pinmux_parse() that can be used to\n",
   "> extract common pinmux configuration to avoid each platform implementing\n",
   "> a parsing loop.  Platforms supply the node containing the pinmux\n",
   "> definitions and a platform specific callback for configuring a pingroup.\n",
   "> \n",
-  "> Signed-off-by: Jamie Iles <jamie-wmLquQDDieKakBO8gow8eQ\@public.gmane.org>\n",
+  "> Signed-off-by: Jamie Iles <jamie\@jamieiles.com>\n",
   "> [swarren: Added support for pins property, added parse() callback, use\n",
   ">  dev_err instead of pr_err, related minor changes]\n",
-  "> Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA\@public.gmane.org>\n",
+  "> Signed-off-by: Stephen Warren <swarren\@nvidia.com>\n",
   "> ---\n",
   ">  drivers/of/Kconfig        |    5 ++\n",
   ">  drivers/of/Makefile       |    1 +\n",
@@ -302,4 +299,4 @@
   ">"
 ]
 
-bf73203840c7b0e3d8e288392a9c67573fe34964bbb270e9f4f81a57efd2f532
+24de86ae453463e733685591b47d506d0df65d3fc537530b6fd18d040e083576
