diff for duplicates of <20130611223138.4A7D43E0D8D@localhost>

diff --git a/a/1.txt b/N1/1.txt
index e4aa1de..a5a78b9 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,4 +1,4 @@
-On Mon, 10 Jun 2013 19:34:37 +0100, Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org> wrote:
+On Mon, 10 Jun 2013 19:34:37 +0100, Will Deacon <will.deacon@arm.com> wrote:
 > The PL330 driver probes the peripheral and primecell IDs of the device to
 > make sure that it is indeed an AMBA PL330. However, it does this by
 > making byte accesses to a device mapping of the word-aligned ID
@@ -8,13 +8,13 @@ On Mon, 10 Jun 2013 19:34:37 +0100, Will Deacon <will.deacon-5wv7dgnIgG8@public.
 > Rather than fix this code, we can actually rip most of it out and let
 > the AMBA bus driver correctly do the probing for us.
 > 
-> Cc: Jassi Brar <jaswinder.singh-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
-> Cc: Vinod Koul <vinod.koul-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
-> Signed-off-by: Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>
+> Cc: Jassi Brar <jaswinder.singh@linaro.org>
+> Cc: Vinod Koul <vinod.koul@intel.com>
+> Signed-off-by: Will Deacon <will.deacon@arm.com>
 
 Right, device drivers shouldn't be cosing their own primecell ID parser.
 
-Acked-by: Grant Likely <grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
+Acked-by: Grant Likely <grant.likely@linaro.org>
 
 > ---
 >  drivers/dma/pl330.c | 27 +++------------------------
@@ -106,7 +106,7 @@ Acked-by: Grant Likely <grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
 > 
 > _______________________________________________
 > 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 e058d5c..34a0280 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,18 +1,12 @@
  "ref\01370889285-22799-1-git-send-email-will.deacon@arm.com\0"
  "ref\01370889285-22799-2-git-send-email-will.deacon@arm.com\0"
- "ref\01370889285-22799-2-git-send-email-will.deacon-5wv7dgnIgG8@public.gmane.org\0"
- "From\0Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>\0"
- "Subject\0Re: [PATCH 1/9] dma: pl330: rip out broken, redundant ID probing\0"
+ "From\0grant.likely@secretlab.ca (Grant Likely)\0"
+ "Subject\0[PATCH 1/9] dma: pl330: rip out broken, redundant ID probing\0"
  "Date\0Tue, 11 Jun 2013 23:31:38 +0100\0"
- "To\0iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org\0"
- "Cc\0Vinod Koul <vinod.koul-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>"
-  Jassi Brar <jaswinder.singh-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
-  devicetree-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:37 +0100, Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org> wrote:\n"
+ "On Mon, 10 Jun 2013 19:34:37 +0100, Will Deacon <will.deacon@arm.com> wrote:\n"
  "> The PL330 driver probes the peripheral and primecell IDs of the device to\n"
  "> make sure that it is indeed an AMBA PL330. However, it does this by\n"
  "> making byte accesses to a device mapping of the word-aligned ID\n"
@@ -22,13 +16,13 @@
  "> Rather than fix this code, we can actually rip most of it out and let\n"
  "> the AMBA bus driver correctly do the probing for us.\n"
  "> \n"
- "> Cc: Jassi Brar <jaswinder.singh-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n"
- "> Cc: Vinod Koul <vinod.koul-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>\n"
- "> Signed-off-by: Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>\n"
+ "> Cc: Jassi Brar <jaswinder.singh@linaro.org>\n"
+ "> Cc: Vinod Koul <vinod.koul@intel.com>\n"
+ "> Signed-off-by: Will Deacon <will.deacon@arm.com>\n"
  "\n"
  "Right, device drivers shouldn't be cosing their own primecell ID parser.\n"
  "\n"
- "Acked-by: Grant Likely <grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n"
+ "Acked-by: Grant Likely <grant.likely@linaro.org>\n"
  "\n"
  "> ---\n"
  ">  drivers/dma/pl330.c | 27 +++------------------------\n"
@@ -120,11 +114,11 @@
  "> \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.
 
-851ecf5b47e30b461d0add8efe35aa19e3a7550efa681b4f898ca164147b8ad7
+17e8f67345aabd8f53f18fdf8425b34420af8d6fda32095fe5227ac0c51ddbbe
