diff for duplicates of <20120324191006.8FC3A3E0AD0@localhost>

diff --git a/a/1.txt b/N1/1.txt
index 41b3361..31ba4b3 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,5 +1,5 @@
 On Thu, 22 Mar 2012 15:53:01 +0100, Nicolas Ferre <nicolas.ferre@atmel.com> wrote:
-> On 03/21/2012 07:03 PM, ludovic.desroches@atmel.com :
+> On 03/21/2012 07:03 PM, ludovic.desroches at atmel.com :
 > > From: Ludovic Desroches <ludovic.desroches@atmel.com>
 > > 
 > > Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
@@ -32,24 +32,24 @@ g.
 > >  				status = "okay";
 > >  			};
 > > +
-> > +			mmc0: mmc@f0008000 {
+> > +			mmc0: mmc at f0008000 {
 > > +				status = "okay";
-> > +				slot@0 {
+> > +				slot at 0 {
 > > +					bus-width = <4>;
 > > +					cd-gpios = <&pioD 15 0>;
 > > +				};
 > > +			};
 > > +
-> > +			mmc1: mmc@f000c000 {
+> > +			mmc1: mmc at f000c000 {
 > > +				status = "okay";
-> > +				slot@0 {
+> > +				slot at 0 {
 > > +					bus-width = <4>;
 > > +					cd-gpios = <&pioD 14 0>;
 > > +				};
 > > +			};
 > >  		};
 > >  
-> >  		usb0: ohci@00600000 {
+> >  		usb0: ohci at 00600000 {
 > 
 > 
 > -- 
@@ -57,7 +57,7 @@ g.
 > 
 > _______________________________________________
 > 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 4111d9a..43f2c94 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,19 +1,14 @@
  "ref\01332352994-20983-1-git-send-email-ludovic.desroches@atmel.com\0"
  "ref\01332352994-20983-5-git-send-email-ludovic.desroches@atmel.com\0"
  "ref\04F6B3CCD.7070105@atmel.com\0"
- "From\0Grant Likely <grant.likely@secretlab.ca>\0"
- "Subject\0Re: [PATCH 4/4] arm: at91: dt: sam9g25ek add mci support\0"
+ "From\0grant.likely@secretlab.ca (Grant Likely)\0"
+ "Subject\0[PATCH 4/4] arm: at91: dt: sam9g25ek add mci support\0"
  "Date\0Sat, 24 Mar 2012 19:10:06 +0000\0"
- "To\0Nicolas Ferre <nicolas.ferre@atmel.com>"
- " ludovic.desroches@atmel.com\0"
- "Cc\0linux-mmc@vger.kernel.org"
-  devicetree-discuss <devicetree-discuss@lists.ozlabs.org>
-  plagnioj@jcrosoft.com
- " linux-arm-kernel@lists.infradead.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Thu, 22 Mar 2012 15:53:01 +0100, Nicolas Ferre <nicolas.ferre@atmel.com> wrote:\n"
- "> On 03/21/2012 07:03 PM, ludovic.desroches@atmel.com :\n"
+ "> On 03/21/2012 07:03 PM, ludovic.desroches at atmel.com :\n"
  "> > From: Ludovic Desroches <ludovic.desroches@atmel.com>\n"
  "> > \n"
  "> > Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>\n"
@@ -46,24 +41,24 @@
  "> >  \t\t\t\tstatus = \"okay\";\n"
  "> >  \t\t\t};\n"
  "> > +\n"
- "> > +\t\t\tmmc0: mmc@f0008000 {\n"
+ "> > +\t\t\tmmc0: mmc at f0008000 {\n"
  "> > +\t\t\t\tstatus = \"okay\";\n"
- "> > +\t\t\t\tslot@0 {\n"
+ "> > +\t\t\t\tslot at 0 {\n"
  "> > +\t\t\t\t\tbus-width = <4>;\n"
  "> > +\t\t\t\t\tcd-gpios = <&pioD 15 0>;\n"
  "> > +\t\t\t\t};\n"
  "> > +\t\t\t};\n"
  "> > +\n"
- "> > +\t\t\tmmc1: mmc@f000c000 {\n"
+ "> > +\t\t\tmmc1: mmc at f000c000 {\n"
  "> > +\t\t\t\tstatus = \"okay\";\n"
- "> > +\t\t\t\tslot@0 {\n"
+ "> > +\t\t\t\tslot at 0 {\n"
  "> > +\t\t\t\t\tbus-width = <4>;\n"
  "> > +\t\t\t\t\tcd-gpios = <&pioD 14 0>;\n"
  "> > +\t\t\t\t};\n"
  "> > +\t\t\t};\n"
  "> >  \t\t};\n"
  "> >  \n"
- "> >  \t\tusb0: ohci@00600000 {\n"
+ "> >  \t\tusb0: ohci at 00600000 {\n"
  "> \n"
  "> \n"
  "> -- \n"
@@ -71,11 +66,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.
 
-b1223abba7bcea3a8809931bcb508a304d67fe2ccb5767bb3062a8f22a3f976f
+a1e12d9b0fd3eafa800185b5e49eda751b0156796d57bf11418b79271de25dfc
