diff for duplicates of <20130612084515.C23AB3E0A56@localhost>

diff --git a/a/1.txt b/N1/1.txt
index f1f17c7..463ba9c 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,9 +1,9 @@
-On Mon, 10 Jun 2013 19:34:45 +0100, Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org> wrote:
+On Mon, 10 Jun 2013 19:34:45 +0100, Will Deacon <will.deacon@arm.com> wrote:
 > Add myself as maintainer for the ARM system MMU driver.
 > 
-> Signed-off-by: Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>
+> Signed-off-by: Will Deacon <will.deacon@arm.com>
 
-Acked-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
+Acked-by: Grant Likely <grant.likely@secretlab.ca>
 
 > ---
 >  MAINTAINERS | 6 ++++++
@@ -18,21 +18,21 @@ Acked-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
 >  F:	arch/arm/mach-zynq/
 >  
 > +ARM SMMU DRIVER
-> +M:	Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>
-> +L:	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org (moderated for non-subscribers)
+> +M:	Will Deacon <will.deacon@arm.com>
+> +L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
 > +S:	Maintained
 > +F:	drivers/iommu/arm-smmu.c
 > +
 >  ARM64 PORT (AARCH64 ARCHITECTURE)
->  M:	Catalin Marinas <catalin.marinas-5wv7dgnIgG8@public.gmane.org>
->  M:	Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>
+>  M:	Catalin Marinas <catalin.marinas@arm.com>
+>  M:	Will Deacon <will.deacon@arm.com>
 > -- 
 > 1.8.2.2
 > 
 > 
 > _______________________________________________
 > linux-arm-kernel mailing list
-> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
+> linux-arm-kernel at lists.infradead.org
 > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
 -- 
diff --git a/a/content_digest b/N1/content_digest
index 58ca278..3f4c96c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,21 +1,17 @@
  "ref\01370889285-22799-1-git-send-email-will.deacon@arm.com\0"
  "ref\01370889285-22799-10-git-send-email-will.deacon@arm.com\0"
- "ref\01370889285-22799-10-git-send-email-will.deacon-5wv7dgnIgG8@public.gmane.org\0"
- "From\0Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>\0"
- "Subject\0Re: [PATCH 9/9] MAINTAINERS: add entry for ARM system MMU driver\0"
+ "From\0grant.likely@secretlab.ca (Grant Likely)\0"
+ "Subject\0[PATCH 9/9] MAINTAINERS: add entry for ARM system MMU driver\0"
  "Date\0Wed, 12 Jun 2013 09:45:15 +0100\0"
- "To\0iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org\0"
- "Cc\0devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org"
-  Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>
- " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
- "On Mon, 10 Jun 2013 19:34:45 +0100, Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org> wrote:\n"
+ "On Mon, 10 Jun 2013 19:34:45 +0100, Will Deacon <will.deacon@arm.com> wrote:\n"
  "> Add myself as maintainer for the ARM system MMU driver.\n"
  "> \n"
- "> Signed-off-by: Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>\n"
+ "> Signed-off-by: Will Deacon <will.deacon@arm.com>\n"
  "\n"
- "Acked-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>\n"
+ "Acked-by: Grant Likely <grant.likely@secretlab.ca>\n"
  "\n"
  "> ---\n"
  ">  MAINTAINERS | 6 ++++++\n"
@@ -30,25 +26,25 @@
  ">  F:\tarch/arm/mach-zynq/\n"
  ">  \n"
  "> +ARM SMMU DRIVER\n"
- "> +M:\tWill Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>\n"
- "> +L:\tlinux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org (moderated for non-subscribers)\n"
+ "> +M:\tWill Deacon <will.deacon@arm.com>\n"
+ "> +L:\tlinux-arm-kernel at lists.infradead.org (moderated for non-subscribers)\n"
  "> +S:\tMaintained\n"
  "> +F:\tdrivers/iommu/arm-smmu.c\n"
  "> +\n"
  ">  ARM64 PORT (AARCH64 ARCHITECTURE)\n"
- ">  M:\tCatalin Marinas <catalin.marinas-5wv7dgnIgG8@public.gmane.org>\n"
- ">  M:\tWill Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>\n"
+ ">  M:\tCatalin Marinas <catalin.marinas@arm.com>\n"
+ ">  M:\tWill Deacon <will.deacon@arm.com>\n"
  "> -- \n"
  "> 1.8.2.2\n"
  "> \n"
  "> \n"
  "> _______________________________________________\n"
  "> linux-arm-kernel mailing list\n"
- "> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\n"
+ "> linux-arm-kernel at lists.infradead.org\n"
  "> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\n"
  "\n"
  "-- \n"
  "Grant Likely, B.Sc, P.Eng.\n"
  Secret Lab Technologies, Ltd.
 
-2f74d83b35667baf325300bf5723322f6167e1bc6114192aed2cc89ce2097215
+f0081b93e2bd30766a8568f919e9f8f73861dd54d74b8946bd97bb6e59966f34
