diff for duplicates of <4F6734DD.3020203@atmel.com>

diff --git a/a/1.txt b/N1/1.txt
index f5ec997..20733f3 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -61,7 +61,7 @@ On 03/17/2012 10:40 AM, Grant Likely :
 >> +
 >> +Example:
 >> +
->> +	sdma: dma-controller@48000000 {
+>> +	sdma: dma-controller at 48000000 {
 >> +		compatible = "ti,sdma-omap4"
 >> +		reg = <0x48000000 0x1000>;
 >> +		interrupts = <12>;
@@ -86,7 +86,7 @@ On 03/17/2012 10:40 AM, Grant Likely :
 >> +
 >> +Example:
 >> +
->> +	i2c1: i2c@1 {
+>> +	i2c1: i2c at 1 {
 >> +		...
 >> +		dma-request = <&sdma 2 &sdma 3>;
 >> +		dma-request-names = "tx", "rx";
@@ -529,7 +529,7 @@ of_dma_to_resource() API will go away.
 >>
 >> _______________________________________________
 >> linux-arm-kernel mailing list
->> linux-arm-kernel@lists.infradead.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 34f3694..c7104bc 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,18 +1,10 @@
  "ref\04F22DEF2.5000807@ti.com\0"
  "ref\01331800690-21518-1-git-send-email-nicolas.ferre@atmel.com\0"
  "ref\020120317094059.7C2333E08E2@localhost\0"
- "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0"
- "Subject\0Re: [PATCH] of: Add generic device tree DMA helpers\0"
+ "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0"
+ "Subject\0[PATCH] of: Add generic device tree DMA helpers\0"
  "Date\0Mon, 19 Mar 2012 14:30:05 +0100\0"
- "To\0Grant Likely <grant.likely@secretlab.ca>"
-  Benoit Cousson <b-cousson@ti.com>
- " Arnd Bergmann <arnd@arndb.de>\0"
- "Cc\0rob.herring@calxeda.com"
-  devicetree-discuss@lists.ozlabs.org
-  linux-arm-kernel@lists.infradead.org
-  Stephen Warren <swarren@nvidia.com>
-  linux-omap@vger.kernel.org
- " Russell King <linux@arm.linux.org.uk>\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On 03/17/2012 10:40 AM, Grant Likely :\n"
@@ -78,7 +70,7 @@
  ">> +\n"
  ">> +Example:\n"
  ">> +\n"
- ">> +\tsdma: dma-controller@48000000 {\n"
+ ">> +\tsdma: dma-controller at 48000000 {\n"
  ">> +\t\tcompatible = \"ti,sdma-omap4\"\n"
  ">> +\t\treg = <0x48000000 0x1000>;\n"
  ">> +\t\tinterrupts = <12>;\n"
@@ -103,7 +95,7 @@
  ">> +\n"
  ">> +Example:\n"
  ">> +\n"
- ">> +\ti2c1: i2c@1 {\n"
+ ">> +\ti2c1: i2c at 1 {\n"
  ">> +\t\t...\n"
  ">> +\t\tdma-request = <&sdma 2 &sdma 3>;\n"
  ">> +\t\tdma-request-names = \"tx\", \"rx\";\n"
@@ -546,7 +538,7 @@
  ">>\n"
  ">> _______________________________________________\n"
  ">> linux-arm-kernel mailing list\n"
- ">> linux-arm-kernel@lists.infradead.org\n"
+ ">> linux-arm-kernel at lists.infradead.org\n"
  ">> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\n"
  "> \n"
  "\n"
@@ -554,4 +546,4 @@
  "-- \n"
  Nicolas Ferre
 
-4d4b9fb9102e04327d7fca112ea0ce3a9d0744281a3a45e0325bb5ea07c44e9a
+3c3f55ece8820eb800f808f2f982e547bdc783352775ceafd0dbb60b7d362616
