diff for duplicates of <1314315824-9687-11-git-send-email-swarren@nvidia.com>

diff --git a/a/1.txt b/N1/1.txt
index a0e5af8..c1747b2 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,14 +1,14 @@
-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 61a19bc..b2405ee 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,10 +2,7 @@
   "ref\0001314315824-9687-1-git-send-email-swarren\@nvidia.com\0"
 ]
 [
-  "ref\0001314315824-9687-1-git-send-email-swarren-DDmLM1+adcrQT0dZR+AlfA\@public.gmane.org\0"
-]
-[
-  "From\0Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA\@public.gmane.org>\0"
+  "From\0Stephen Warren <swarren\@nvidia.com>\0"
 ]
 [
   "Subject\0[PATCH v3 10/13] of: add a generic pinmux helper\0"
@@ -14,20 +11,24 @@
   "Date\0Thu, 25 Aug 2011 17:43:41 -0600\0"
 ]
 [
-  "To\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>\0"
+  "To\0Grant Likely <grant.likely\@secretlab.ca>",
+  " Colin Cross <ccross\@android.com>",
+  " Erik Gilling <konkers\@android.com>",
+  " Olof Johansson <olof\@lixom.net>\0"
 ]
 [
-  "Cc\0Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ\@public.gmane.org>",
-  " Sergei Shtylyov <sshtylyov-Igf4POYTYCDQT0dZR+AlfA\@public.gmane.org>",
-  " Belisko Marek <marek.belisko-Re5JQEeQqe8AvxtiuMwx3w\@public.gmane.org>",
-  " devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ\@public.gmane.org",
-  " linux-kernel-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
-  " linux-tegra-u79uwXL29TY76Z2rM5mHXA\@public.gmane.org",
-  " Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A\@public.gmane.org>",
-  " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r\@public.gmane.org\0"
+  "Cc\0Russell 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>",
+  " Stephen Warren <swarren\@nvidia.com>\0"
 ]
 [
   "\0000:1\0"
@@ -36,17 +37,17 @@
   "b\0"
 ]
 [
-  "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",
@@ -278,4 +279,4 @@
   "1.7.0.4"
 ]
 
-83a7ca9808b460df9556a90b6af8a7d59cf03c57ede744d36b00a05530e80316
+bdaadecdc08f70af592d2e3f84bd4a6cfc60450712e2134c9bbd3afadfa5d689
