diff for duplicates of <20130813141947.GF2823@localhost.localdomain>

diff --git a/a/1.txt b/N1/1.txt
index 029b981..1365e30 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -11,7 +11,7 @@ On Fri, Aug 09, 2013 at 04:26:16PM -0700, Roy Franz wrote:
 
 Thanks for the update -- a few more comments, nothing major.
 
-> Signed-off-by: Roy Franz <roy.franz-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
+> Signed-off-by: Roy Franz <roy.franz@linaro.org>
 > ---
 >  arch/arm/boot/compressed/Makefile     |   15 +-
 >  arch/arm/boot/compressed/efi-header.S |  111 ++++++++
@@ -58,7 +58,7 @@ Thanks for the update -- a few more comments, nothing major.
 > --- /dev/null
 > +++ b/arch/arm/boot/compressed/efi-header.S
 > @@ -0,0 +1,111 @@
-> +@ Copyright (C) 2013 Linaro Ltd;  <roy.franz-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
+> +@ Copyright (C) 2013 Linaro Ltd;  <roy.franz@linaro.org>
 > +@
 > +@ This file contains the PE/COFF header that is part of the
 > +@ EFI stub.
@@ -178,7 +178,7 @@ Thanks for the update -- a few more comments, nothing major.
 > +/*
 > + * linux/arch/arm/boot/compressed/efi-stub.c
 > + *
-> + * Copyright (C) 2013 Linaro Ltd;  <roy.franz-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
+> + * Copyright (C) 2013 Linaro Ltd;  <roy.franz@linaro.org>
 > + *
 > + * This file implements the EFI boot stub for the ARM kernel
 > + *
@@ -856,5 +856,5 @@ probably works.  The assembler will turn this into a cmn as necessary.
 > 
 > _______________________________________________
 > 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 4ced67f..fe8256f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,17 +1,9 @@
  "ref\01376090777-20090-1-git-send-email-roy.franz@linaro.org\0"
  "ref\01376090777-20090-16-git-send-email-roy.franz@linaro.org\0"
- "ref\01376090777-20090-16-git-send-email-roy.franz-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org\0"
- "From\0Dave Martin <Dave.Martin-5wv7dgnIgG8@public.gmane.org>\0"
- "Subject\0Re: [PATCH 15/16] Add EFI stub for ARM\0"
+ "From\0Dave.Martin@arm.com (Dave Martin)\0"
+ "Subject\0[PATCH 15/16] Add EFI stub for ARM\0"
  "Date\0Tue, 13 Aug 2013 15:19:48 +0100\0"
- "To\0Roy Franz <roy.franz-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0"
- "Cc\0linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
-  linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
-  matt.fleming-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org
-  linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org
-  leif.lindholm-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org
- " msalter-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Fri, Aug 09, 2013 at 04:26:16PM -0700, Roy Franz wrote:\n"
@@ -27,7 +19,7 @@
  "\n"
  "Thanks for the update -- a few more comments, nothing major.\n"
  "\n"
- "> Signed-off-by: Roy Franz <roy.franz-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n"
+ "> Signed-off-by: Roy Franz <roy.franz@linaro.org>\n"
  "> ---\n"
  ">  arch/arm/boot/compressed/Makefile     |   15 +-\n"
  ">  arch/arm/boot/compressed/efi-header.S |  111 ++++++++\n"
@@ -74,7 +66,7 @@
  "> --- /dev/null\n"
  "> +++ b/arch/arm/boot/compressed/efi-header.S\n"
  "> @@ -0,0 +1,111 @@\n"
- "> +@ Copyright (C) 2013 Linaro Ltd;  <roy.franz-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n"
+ "> +@ Copyright (C) 2013 Linaro Ltd;  <roy.franz@linaro.org>\n"
  "> +@\n"
  "> +@ This file contains the PE/COFF header that is part of the\n"
  "> +@ EFI stub.\n"
@@ -194,7 +186,7 @@
  "> +/*\n"
  "> + * linux/arch/arm/boot/compressed/efi-stub.c\n"
  "> + *\n"
- "> + * Copyright (C) 2013 Linaro Ltd;  <roy.franz-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\n"
+ "> + * Copyright (C) 2013 Linaro Ltd;  <roy.franz@linaro.org>\n"
  "> + *\n"
  "> + * This file implements the EFI boot stub for the ARM kernel\n"
  "> + *\n"
@@ -872,7 +864,7 @@
  "> \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
 
-169dcc87efb45db086b2d67eb413fada31b590964b8e6816f584f128b31924d4
+2685c93446dd7d0905ffbd7008e2824f16c397b730ddef90112b4c25fe00d5d9
