diff for duplicates of <4E011678.4030208@firmworks.com>

diff --git a/a/1.txt b/N1/1.txt
index c8eefe0..0402516 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -3,7 +3,7 @@ On 6/21/2011 9:38 AM, Grant Likely wrote:
 >> What is the problem with
 >>
 >> aliases{
->>    serial0 = "/uart at 7000c000";
+>>    serial0 = "/uart@7000c000";
 >> }
 >>
 >> Properties in the alias node are supposed to have string values.
@@ -98,7 +98,7 @@ property takes precedence over an earlier one, as is the OFW convention).
 >>> David, perhaps using this format for a label should turn it into an
 >>> alias (prefix label with an asterisk):
 >>>
->>>          *thealias: i2c at 12340000 { /*...*/ };
+>>>          *thealias: i2c@12340000 { /*...*/ };
 >>>
 >>> .... although that approach gets *really* hairy when considering that
 >>> different boards will want different enumeration.  How would one
@@ -112,8 +112,8 @@ property takes precedence over an earlier one, as is the OFW convention).
 >>>>                         reg =<0x70000000 0x40000>;
 >>>>                         ranges;
 >>>>
->>>> -                       uart at 7000c000 {
->>>> +                       uart2: uart at 7000c000 {
+>>>> -                       uart@7000c000 {
+>>>> +                       uart2: uart@7000c000 {
 >>>>                                 compatible = "fsl,imx51-uart",
 >>>> "fsl,imx21-uart";
 >>>>                                 reg =<0x7000c000 0x4000>;
@@ -124,8 +124,8 @@ property takes precedence over an earlier one, as is the OFW convention).
 >>>>                         };
 >>>>                 };
 >>>>
->>>> -               uart at 73fbc000 {
->>>> +               uart0: uart at 73fbc000 {
+>>>> -               uart@73fbc000 {
+>>>> +               uart0: uart@73fbc000 {
 >>>>                         compatible = "fsl,imx51-uart", "fsl,imx21-uart";
 >>>>                         reg =<0x73fbc000 0x4000>;
 >>>>                         interrupts =<31>;
@@ -134,8 +134,8 @@ property takes precedence over an earlier one, as is the OFW convention).
 >>>> +                       fsl,uart-has-rtscts;
 >>>>                 };
 >>>>
->>>> -               uart at 73fc0000 {
->>>> +               uart1: uart at 73fc0000 {
+>>>> -               uart@73fc0000 {
+>>>> +               uart1: uart@73fc0000 {
 >>>>                         compatible = "fsl,imx51-uart", "fsl,imx21-uart";
 >>>>                         reg =<0x73fc0000 0x4000>;
 >>>>                         interrupts =<32>;
@@ -264,7 +264,7 @@ property takes precedence over an earlier one, as is the OFW convention).
 >>
 >> _______________________________________________
 >> 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
 >>
 >
diff --git a/a/content_digest b/N1/content_digest
index a5a6e84..66672aa 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -6,10 +6,19 @@
  "ref\0BANLkTim4vunTm1176MRw3pqRZnunu4=9jg@mail.gmail.com\0"
  "ref\04E00F290.2010303@firmworks.com\0"
  "ref\0BANLkTik9LXTJ--fRwUBscokWraPwOZnpHA@mail.gmail.com\0"
- "From\0wmb@firmworks.com (Mitch Bradley)\0"
- "Subject\0[PATCH 1/3] serial/imx: add device tree support\0"
+ "From\0Mitch Bradley <wmb@firmworks.com>\0"
+ "Subject\0Re: [PATCH 1/3] serial/imx: add device tree support\0"
  "Date\0Tue, 21 Jun 2011 18:08:56 -0400\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Grant Likely <grant.likely@secretlab.ca>\0"
+ "Cc\0patches@linaro.org"
+  netdev@vger.kernel.org
+  devicetree-discuss@lists.ozlabs.org
+  Jason Liu <jason.hui@linaro.org>
+  linux-kernel@vger.kernel.org
+  linux-arm-kernel@lists.infradead.org
+  Jeremy Kerr <jeremy.kerr@canonical.com>
+  Sascha Hauer <s.hauer@pengutronix.de>
+ " Shawn Guo <shawn.guo@freescale.com>\0"
  "\00:1\0"
  "b\0"
  "On 6/21/2011 9:38 AM, Grant Likely wrote:\n"
@@ -17,7 +26,7 @@
  ">> What is the problem with\n"
  ">>\n"
  ">> aliases{\n"
- ">>    serial0 = \"/uart at 7000c000\";\n"
+ ">>    serial0 = \"/uart@7000c000\";\n"
  ">> }\n"
  ">>\n"
  ">> Properties in the alias node are supposed to have string values.\n"
@@ -112,7 +121,7 @@
  ">>> David, perhaps using this format for a label should turn it into an\n"
  ">>> alias (prefix label with an asterisk):\n"
  ">>>\n"
- ">>>          *thealias: i2c at 12340000 { /*...*/ };\n"
+ ">>>          *thealias: i2c@12340000 { /*...*/ };\n"
  ">>>\n"
  ">>> .... although that approach gets *really* hairy when considering that\n"
  ">>> different boards will want different enumeration.  How would one\n"
@@ -126,8 +135,8 @@
  ">>>>                         reg =<0x70000000 0x40000>;\n"
  ">>>>                         ranges;\n"
  ">>>>\n"
- ">>>> -                       uart at 7000c000 {\n"
- ">>>> +                       uart2: uart at 7000c000 {\n"
+ ">>>> -                       uart@7000c000 {\n"
+ ">>>> +                       uart2: uart@7000c000 {\n"
  ">>>>                                 compatible = \"fsl,imx51-uart\",\n"
  ">>>> \"fsl,imx21-uart\";\n"
  ">>>>                                 reg =<0x7000c000 0x4000>;\n"
@@ -138,8 +147,8 @@
  ">>>>                         };\n"
  ">>>>                 };\n"
  ">>>>\n"
- ">>>> -               uart at 73fbc000 {\n"
- ">>>> +               uart0: uart at 73fbc000 {\n"
+ ">>>> -               uart@73fbc000 {\n"
+ ">>>> +               uart0: uart@73fbc000 {\n"
  ">>>>                         compatible = \"fsl,imx51-uart\", \"fsl,imx21-uart\";\n"
  ">>>>                         reg =<0x73fbc000 0x4000>;\n"
  ">>>>                         interrupts =<31>;\n"
@@ -148,8 +157,8 @@
  ">>>> +                       fsl,uart-has-rtscts;\n"
  ">>>>                 };\n"
  ">>>>\n"
- ">>>> -               uart at 73fc0000 {\n"
- ">>>> +               uart1: uart at 73fc0000 {\n"
+ ">>>> -               uart@73fc0000 {\n"
+ ">>>> +               uart1: uart@73fc0000 {\n"
  ">>>>                         compatible = \"fsl,imx51-uart\", \"fsl,imx21-uart\";\n"
  ">>>>                         reg =<0x73fc0000 0x4000>;\n"
  ">>>>                         interrupts =<32>;\n"
@@ -278,11 +287,11 @@
  ">>\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"
  >
 
-37f643353aa6f1279b468ff276611912f5291071c13b851e75c26c2650258f22
+bff89af527ad7a7cb416367ae54c3d7c5851ac8b00d94353730ee6e6e07fe531
