diff for duplicates of <4FF138F2.6070503@freescale.com>

diff --git a/a/1.txt b/N1/1.txt
index 9dd039b..629034d 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,4 +1,4 @@
-于 2012年07月02日 13:39, Hui Wang 写道:
+? 2012?07?02? 13:39, Hui Wang ??:
 > Huang Shijie wrote:
 >> The gpmi nand driver may needs several clocks(MX6Q needs five clocks).
 >>
@@ -24,14 +24,14 @@
 >> --- a/arch/arm/boot/dts/imx6q-arm2.dts
 >> +++ b/arch/arm/boot/dts/imx6q-arm2.dts
 >> @@ -25,7 +25,7 @@
->> gpmi-nand@00112000 {
+>> gpmi-nand at 00112000 {
 >> pinctrl-names = "default";
 >> pinctrl-0 = <&pinctrl_gpmi_nand_1>;
 >> - status = "disabled"; /* gpmi nand conflicts with SD */
 >> + status = "okay"; /* gpmi nand conflicts with SD */
 >> };
 >>
->> aips-bus@02100000 { /* AIPS2 */
+>> aips-bus at 02100000 { /* AIPS2 */
 >> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c 
 >> b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
 >> index a1f4332..c3778c0 100644
@@ -86,6 +86,6 @@ Huang Shijie
 >
 > _______________________________________________
 > 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 9bed2bd..d901cde 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,19 +1,13 @@
  "ref\01341200327-8144-1-git-send-email-shijie8@gmail.com\0"
  "ref\01341200327-8144-4-git-send-email-shijie8@gmail.com\0"
  "ref\04FF133F9.50704@gmail.com\0"
- "From\0Huang Shijie <b32955@freescale.com>\0"
- "Subject\0Re: [PATCH v3 3/3] mtd: gpmi: change the code for clocks\0"
+ "From\0b32955@freescale.com (Huang Shijie)\0"
+ "Subject\0[PATCH v3 3/3] mtd: gpmi: change the code for clocks\0"
  "Date\0Mon, 2 Jul 2012 14:00:18 +0800\0"
- "To\0Hui Wang <jason77.wang@gmail.com>\0"
- "Cc\0shawn.guo@linaro.org"
-  dedekind1@gmail.com
-  linux-mtd@lists.infradead.org
-  dong.aisheng@linaro.org
-  Huang Shijie <shijie8@gmail.com>
- " linux-arm-kernel@lists.infradead.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
- "\344\272\216 2012\345\271\26407\346\234\21002\346\227\245 13:39, Hui Wang \345\206\231\351\201\223:\n"
+ "? 2012?07?02? 13:39, Hui Wang ??:\n"
  "> Huang Shijie wrote:\n"
  ">> The gpmi nand driver may needs several clocks(MX6Q needs five clocks).\n"
  ">>\n"
@@ -39,14 +33,14 @@
  ">> --- a/arch/arm/boot/dts/imx6q-arm2.dts\n"
  ">> +++ b/arch/arm/boot/dts/imx6q-arm2.dts\n"
  ">> @@ -25,7 +25,7 @@\n"
- ">> gpmi-nand@00112000 {\n"
+ ">> gpmi-nand at 00112000 {\n"
  ">> pinctrl-names = \"default\";\n"
  ">> pinctrl-0 = <&pinctrl_gpmi_nand_1>;\n"
  ">> - status = \"disabled\"; /* gpmi nand conflicts with SD */\n"
  ">> + status = \"okay\"; /* gpmi nand conflicts with SD */\n"
  ">> };\n"
  ">>\n"
- ">> aips-bus@02100000 { /* AIPS2 */\n"
+ ">> aips-bus at 02100000 { /* AIPS2 */\n"
  ">> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c \n"
  ">> b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c\n"
  ">> index a1f4332..c3778c0 100644\n"
@@ -101,8 +95,8 @@
  ">\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"
  >
 
-7357209ebc99750d07cedb09f4382410a7bdd8349d3e15136b87c445ede40437
+cbc31fa14e6a819ce1abcd8dbf8c16d16f70a391c158e2c44802366df313704c
