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

diff --git a/a/1.txt b/N1/1.txt
index d3ffd44..5969a3c 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -6,7 +6,7 @@ struct of_iter_string_prop iter;
 for_each_string_property_value(iter, np, "pins")
         printk("Got value %s\n", iter.value);
 
-Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
+Signed-off-by: Stephen Warren <swarren@nvidia.com>
 ---
  include/linux/of_iter_prop.h |  135 ++++++++++++++++++++++++++++++++++++++++++
  1 files changed, 135 insertions(+), 0 deletions(-)
diff --git a/a/content_digest b/N1/content_digest
index 4ee1137..42edf86 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 11/13] of: add property iteration helpers\0"
@@ -14,20 +11,24 @@
   "Date\0Thu, 25 Aug 2011 17:43:42 -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"
@@ -44,7 +45,7 @@
   "for_each_string_property_value(iter, np, \"pins\")\n",
   "        printk(\"Got value %s\\n\", iter.value);\n",
   "\n",
-  "Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA\@public.gmane.org>\n",
+  "Signed-off-by: Stephen Warren <swarren\@nvidia.com>\n",
   "---\n",
   " include/linux/of_iter_prop.h |  135 ++++++++++++++++++++++++++++++++++++++++++\n",
   " 1 files changed, 135 insertions(+), 0 deletions(-)\n",
@@ -195,4 +196,4 @@
   "1.7.0.4"
 ]
 
-9e251008e006a7a801c2c2e493519ecfd64bf647993a8d0891f25e2f31a3bda6
+92a2df4ebc79c1d01f7c2c98adbb2e98c62518f12893bb979b6c520fa6ec868a
