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

diff --git a/a/1.txt b/N1/1.txt
index df90268..471d905 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,8 +1,8 @@
-Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
+Signed-off-by: Stephen Warren <swarren@nvidia.com>
 [j.iles: converted to generic of_pinmux_parse()]
-Signed-off-by: Jamie Iles <jamie-wmLquQDDieKakBO8gow8eQ@public.gmane.org>
+Signed-off-by: Jamie Iles <jamie@jamieiles.com>
 [swarren: Added support for pins property]
-Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
+Signed-off-by: Stephen Warren <swarren@nvidia.com>
 ---
  arch/arm/mach-tegra/pinmux.c |  260 ++++++++++++++++++++++++++++++++++++++++++
  1 files changed, 260 insertions(+), 0 deletions(-)
diff --git a/a/content_digest b/N1/content_digest
index c9c72f2..a1eebfc 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 12/13] arm/tegra: Add device tree support to pinmux driver\0"
@@ -14,24 +11,24 @@
   "Date\0Thu, 25 Aug 2011 17:43:43 -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>",
-  " 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>",
-  " Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA\@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"
@@ -40,11 +37,11 @@
   "b\0"
 ]
 [
-  "Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA\@public.gmane.org>\n",
+  "Signed-off-by: Stephen Warren <swarren\@nvidia.com>\n",
   "[j.iles: converted to generic of_pinmux_parse()]\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]\n",
-  "Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA\@public.gmane.org>\n",
+  "Signed-off-by: Stephen Warren <swarren\@nvidia.com>\n",
   "---\n",
   " arch/arm/mach-tegra/pinmux.c |  260 ++++++++++++++++++++++++++++++++++++++++++\n",
   " 1 files changed, 260 insertions(+), 0 deletions(-)\n",
@@ -361,4 +358,4 @@
   "1.7.0.4"
 ]
 
-90609b08dc57a986ead8607158736f77d67e6d7bb3e4f2f1fcb8871bd9393324
+f21001d5623bb46dcc63661fab671ccf876db731fd378bf68dea2747c2cf5f8d
