diff for duplicates of <20110905092421.GD19678@pengutronix.de>

diff --git a/a/1.txt b/N1/1.txt
index 653bdac..f851f03 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -30,7 +30,7 @@ On Fri, Jul 15, 2011 at 05:44:26PM +0800, Shawn Guo wrote:
 > +
 > +Examples:
 > +
-> +sdma at 83fb0000 {
+> +sdma@83fb0000 {
 > +	compatible = "fsl,imx51-sdma", "fsl,imx35-sdma";
 > +	reg = <0x83fb0000 0x4000>;
 > +	interrupts = <6>;
@@ -143,10 +143,10 @@ pdev->id_entry?
 > 
 > _______________________________________________
 > linux-arm-kernel mailing list
-> linux-arm-kernel at lists.infradead.org
+> linux-arm-kernel@lists.infradead.org
 > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 > 
 
 -- 
-Pengutronix e.K.                           | Uwe Kleine-K?nig            |
+Pengutronix e.K.                           | Uwe Kleine-König            |
 Industrial Linux Solutions                 | http://www.pengutronix.de/  |
diff --git a/a/content_digest b/N1/content_digest
index 56c2b4f..bf06a16 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,15 @@
  "ref\01310723066-567-1-git-send-email-shawn.guo@linaro.org\0"
  "ref\01310723066-567-4-git-send-email-shawn.guo@linaro.org\0"
- "From\0u.kleine-koenig@pengutronix.de (Uwe Kleine-K\303\266nig)\0"
- "Subject\0[PATCH v2 3/3] dmaengine: imx-sdma: add device tree probe support\0"
+ "From\0Uwe Kleine-K\303\266nig <u.kleine-koenig@pengutronix.de>\0"
+ "Subject\0Re: [PATCH v2 3/3] dmaengine: imx-sdma: add device tree probe support\0"
  "Date\0Mon, 5 Sep 2011 11:24:21 +0200\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Shawn Guo <shawn.guo@linaro.org>\0"
+ "Cc\0patches@linaro.org"
+  Vinod Koul <vinod.koul@intel.com>
+  devicetree-discuss@lists.ozlabs.org
+  Grant Likely <grant.likely@secretlab.ca>
+  Sascha Hauer <s.hauer@pengutronix.de>
+ " linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Hi Shawn,\n"
@@ -38,7 +44,7 @@
  "> +\n"
  "> +Examples:\n"
  "> +\n"
- "> +sdma at 83fb0000 {\n"
+ "> +sdma@83fb0000 {\n"
  "> +\tcompatible = \"fsl,imx51-sdma\", \"fsl,imx35-sdma\";\n"
  "> +\treg = <0x83fb0000 0x4000>;\n"
  "> +\tinterrupts = <6>;\n"
@@ -151,12 +157,12 @@
  "> \n"
  "> _______________________________________________\n"
  "> linux-arm-kernel mailing list\n"
- "> linux-arm-kernel at lists.infradead.org\n"
+ "> linux-arm-kernel@lists.infradead.org\n"
  "> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\n"
  "> \n"
  "\n"
  "-- \n"
- "Pengutronix e.K.                           | Uwe Kleine-K?nig            |\n"
+ "Pengutronix e.K.                           | Uwe Kleine-K\303\266nig            |\n"
  Industrial Linux Solutions                 | http://www.pengutronix.de/  |
 
-c2a75bb6e2f4fc63299fe4428d1d23b7a4b0733c38c68a0cb180828172a2c71c
+5829deb726e4be7c0585c4bf1fa44ef7d7657fba061929adb386fd47d277a032
