diff for duplicates of <5219791.0WtDlTNBEQ@flexo>

diff --git a/a/1.txt b/N1/1.txt
index 444d110..a9bf151 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -9,8 +9,8 @@ Why don't you reorder this patch to be after patch 11/12 so that you do not
 need to update this file in patch 11/12?
 
 > 
-> Signed-off-by: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>
-> Acked-by: Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org>
+> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
+> Acked-by: Jason Cooper <jason@lakedaemon.net>
 > ---
 [snip]
 >  
@@ -90,12 +90,12 @@ kirkwood/board-ts219.c
 > + *
 > + * QNAP TS-11x/TS-21x Turbo NAS Board Setup via DT
 > + *
-> + * Copyright (C) 2012 Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>
+> + * Copyright (C) 2012 Andrew Lunn <andrew@lunn.ch>
 > + *
 > + * Based on the board file ts219-setup.c:
 > + *
-> + * Copyright (C) 2009  Martin Michlmayr <tbm-R+vWnYXSFMfQT0dZR+AlfA@public.gmane.org>
-> + * Copyright (C) 2008  Byron Bradley <byron.bbradley-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
+> + * Copyright (C) 2009  Martin Michlmayr <tbm@cyrius.com>
+> + * Copyright (C) 2008  Byron Bradley <byron.bbradley@gmail.com>
 > + *
 > + * This program is free software; you can redistribute it and/or
 > + * modify it under the terms of the GNU General Public License
@@ -196,5 +196,5 @@ kirkwood/common.h
 > 
 > _______________________________________________
 > 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 f70662b..a815167 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,18 +1,9 @@
  "ref\01341325365-21393-1-git-send-email-andrew@lunn.ch\0"
  "ref\01341325365-21393-9-git-send-email-andrew@lunn.ch\0"
- "ref\01341325365-21393-9-git-send-email-andrew-g2DYL2Zd6BY@public.gmane.org\0"
- "From\0Florian Fainelli <florian-p3rKhJxN3npAfugRpC6u6w@public.gmane.org>\0"
- "Subject\0Re: [PATCH v2 08/12] Kirkwood: Add basic device tree support for QNAP TS219.\0"
+ "From\0florian@openwrt.org (Florian Fainelli)\0"
+ "Subject\0[PATCH v2 08/12] Kirkwood: Add basic device tree support for QNAP TS219.\0"
  "Date\0Tue, 03 Jul 2012 17:47:57 +0200\0"
- "To\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0"
- "Cc\0Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>"
-  Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org>
-  devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
-  rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org
-  grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org
-  Michael Walle <michael-QKn5cuLxLXY@public.gmane.org>
-  linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
- " spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Hi Andrew,\n"
@@ -26,8 +17,8 @@
  "need to update this file in patch 11/12?\n"
  "\n"
  "> \n"
- "> Signed-off-by: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>\n"
- "> Acked-by: Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org>\n"
+ "> Signed-off-by: Andrew Lunn <andrew@lunn.ch>\n"
+ "> Acked-by: Jason Cooper <jason@lakedaemon.net>\n"
  "> ---\n"
  "[snip]\n"
  ">  \n"
@@ -107,12 +98,12 @@
  "> + *\n"
  "> + * QNAP TS-11x/TS-21x Turbo NAS Board Setup via DT\n"
  "> + *\n"
- "> + * Copyright (C) 2012 Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>\n"
+ "> + * Copyright (C) 2012 Andrew Lunn <andrew@lunn.ch>\n"
  "> + *\n"
  "> + * Based on the board file ts219-setup.c:\n"
  "> + *\n"
- "> + * Copyright (C) 2009  Martin Michlmayr <tbm-R+vWnYXSFMfQT0dZR+AlfA@public.gmane.org>\n"
- "> + * Copyright (C) 2008  Byron Bradley <byron.bbradley-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n"
+ "> + * Copyright (C) 2009  Martin Michlmayr <tbm@cyrius.com>\n"
+ "> + * Copyright (C) 2008  Byron Bradley <byron.bbradley@gmail.com>\n"
  "> + *\n"
  "> + * This program is free software; you can redistribute it and/or\n"
  "> + * modify it under the terms of the GNU General Public License\n"
@@ -213,7 +204,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
 
-22057eb85218cc20f0320b432a6af5134f0a8b4e21efb9530146135774764863
+9fa9c783a2b553e1ed91b4614e20fffc022266115e8f11d66ef2aa8b97c3d69a
