diff for duplicates of <20120317094059.7C2333E08E2@localhost>

diff --git a/a/1.txt b/N1/1.txt
index 27881b4..b6b57f2 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -60,7 +60,7 @@ Comments below.
 > +
 > +Example:
 > +
-> +	sdma: dma-controller@48000000 {
+> +	sdma: dma-controller at 48000000 {
 > +		compatible = "ti,sdma-omap4"
 > +		reg = <0x48000000 0x1000>;
 > +		interrupts = <12>;
@@ -85,7 +85,7 @@ Comments below.
 > +
 > +Example:
 > +
-> +	i2c1: i2c@1 {
+> +	i2c1: i2c at 1 {
 > +		...
 > +		dma-request = <&sdma 2 &sdma 3>;
 > +		dma-request-names = "tx", "rx";
@@ -485,7 +485,7 @@ register regions and irqs, but it is expanding it.
 > 
 > _______________________________________________
 > 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 33fffa4..d94f74b 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,16 +1,9 @@
  "ref\04F22DEF2.5000807@ti.com\0"
  "ref\01331800690-21518-1-git-send-email-nicolas.ferre@atmel.com\0"
- "From\0Grant Likely <grant.likely@secretlab.ca>\0"
- "Subject\0Re: [PATCH] of: Add generic device tree DMA helpers\0"
+ "From\0grant.likely@secretlab.ca (Grant Likely)\0"
+ "Subject\0[PATCH] of: Add generic device tree DMA helpers\0"
  "Date\0Sat, 17 Mar 2012 09:40:59 +0000\0"
- "To\0rob.herring@calxeda.com"
-  devicetree-discuss@lists.ozlabs.org
- " linux-arm-kernel@lists.infradead.org\0"
- "Cc\0Stephen Warren <swarren@nvidia.com>"
-  linux-omap@vger.kernel.org
-  Nicolas Ferre <nicolas.ferre@atmel.com>
-  Benoit Cousson <b-cousson@ti.com>
- " Russell King <linux@arm.linux.org.uk>\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Thu, 15 Mar 2012 09:38:10 +0100, Nicolas Ferre <nicolas.ferre@atmel.com> wrote:\n"
@@ -75,7 +68,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"
@@ -100,7 +93,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"
@@ -500,11 +493,11 @@
  "> \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"
  "Grant Likely, B.Sc, P.Eng.\n"
  Secret Lab Technologies,Ltd.
 
-25df1b4154ce2f9e93273dbf38a4510b62e768cb513653e7da207208a2a8e3cb
+7f85d74032c18ea3e60e8a9f3455f1ae0ec4a734b1f4dd061e178fe647166489
