diff for duplicates of <20151007102822.GT23801@atomide.com>

diff --git a/a/1.txt b/N1/1.txt
index bdd3a1f..a9cd02d 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,4 +1,4 @@
-* Uwe Kleine-König <u.kleine-koenig@pengutronix.de> [151007 00:57]:
+* Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> [151007 00:57]:
 > On Wed, Oct 07, 2015 at 10:45:50AM +0300, Roger Quadros wrote:
 > > 
 > > How about this instead?
@@ -38,11 +38,11 @@ GPMC option is selected in the platform specific Kconfig.
 
 Let's also update the description a bit, it does not mention that
 enabling the debug option also disables the reset of GPMC controller
-during the init as pointed out by Uwe Kleine-König
+during the init as pointed out by Uwe Kleine-K?nig
 <u.kleine-koenig@pengutronix.de> and Roger Quadros <rogerq@ti.com>.
 
 Fixes: 63aa945b1013 ("memory: omap-gpmc: Add Kconfig option for debug")
-Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
+Reported-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
 Signed-off-by: Tony Lindgren <tony@atomide.com>
 
 --- a/drivers/memory/Kconfig
@@ -69,8 +69,3 @@ Signed-off-by: Tony Lindgren <tony@atomide.com>
  
  config MVEBU_DEVBUS
  	bool "Marvell EBU Device Bus Controller"
-
-_______________________________________________
-linux-arm-kernel mailing list
-linux-arm-kernel@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/a/content_digest b/N1/content_digest
index d41c1fb..62b3d12 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,17 +2,13 @@
  "ref\01444162070-22034-2-git-send-email-u.kleine-koenig@pengutronix.de\0"
  "ref\05614CDAE.6070604@ti.com\0"
  "ref\020151007075338.GH3982@pengutronix.de\0"
- "From\0Tony Lindgren <tony@atomide.com>\0"
- "Subject\0Re: [PATCH 2/2] memory: omap-gpmc: expand the description of the debug facility\0"
+ "From\0tony@atomide.com (Tony Lindgren)\0"
+ "Subject\0[PATCH 2/2] memory: omap-gpmc: expand the description of the debug facility\0"
  "Date\0Wed, 7 Oct 2015 03:41:19 -0700\0"
- "To\0Uwe Kleine-K\303\266nig <u.kleine-koenig@pengutronix.de>\0"
- "Cc\0linux-omap@vger.kernel.org"
-  linux-arm-kernel@lists.infradead.org
-  kernel@pengutronix.de
- " Roger Quadros <rogerq@ti.com>\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
- "* Uwe Kleine-K\303\266nig <u.kleine-koenig@pengutronix.de> [151007 00:57]:\n"
+ "* Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> [151007 00:57]:\n"
  "> On Wed, Oct 07, 2015 at 10:45:50AM +0300, Roger Quadros wrote:\n"
  "> > \n"
  "> > How about this instead?\n"
@@ -52,11 +48,11 @@
  "\n"
  "Let's also update the description a bit, it does not mention that\n"
  "enabling the debug option also disables the reset of GPMC controller\n"
- "during the init as pointed out by Uwe Kleine-K\303\266nig\n"
+ "during the init as pointed out by Uwe Kleine-K?nig\n"
  "<u.kleine-koenig@pengutronix.de> and Roger Quadros <rogerq@ti.com>.\n"
  "\n"
  "Fixes: 63aa945b1013 (\"memory: omap-gpmc: Add Kconfig option for debug\")\n"
- "Reported-by: Uwe Kleine-K\303\266nig <u.kleine-koenig@pengutronix.de>\n"
+ "Reported-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>\n"
  "Signed-off-by: Tony Lindgren <tony@atomide.com>\n"
  "\n"
  "--- a/drivers/memory/Kconfig\n"
@@ -82,11 +78,6 @@
  "+\t  bootloader timings.\n"
  " \n"
  " config MVEBU_DEVBUS\n"
- " \tbool \"Marvell EBU Device Bus Controller\"\n"
- "\n"
- "_______________________________________________\n"
- "linux-arm-kernel mailing list\n"
- "linux-arm-kernel@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+ " \tbool \"Marvell EBU Device Bus Controller\""
 
-4888ebd10111a068bae02f34b88b399e257c5b0b55b957ceae51e2ae7fcd3b82
+29e5813deb5cd0f3c886cfb86e6a0060b3ecfb8952682b319f233e1d60f773c2
