diff for duplicates of <20160217171627.GG16812@shlinux2>

diff --git a/a/1.txt b/N1/1.txt
index ff9912f..e71967e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -23,14 +23,14 @@ On Tue, Jan 26, 2016 at 03:24:00PM +0800, Yuan Yao wrote:
 >  &qspi {
 >  	status = "okay";
 > -	qflash0: s25fl008k {
-> +	flash0: s25fl256s1@0 {
+> +	flash0: s25fl256s1 at 0 {
 > +		#address-cells = <1>;
 > +		#size-cells = <1>;
 > +		compatible = "st,m25p80";
 > +		spi-max-frequency = <20000000>;
 > +		reg = <0>;
 > +	};
-> +	flash2: s25fl256s1@2 {
+> +	flash2: s25fl256s1 at 2 {
 >  		#address-cells = <1>;
 >  		#size-cells = <1>;
 >  		compatible = "st,m25p80";
@@ -40,7 +40,7 @@ On Tue, Jan 26, 2016 at 03:24:00PM +0800, Yuan Yao wrote:
 > +++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
 > @@ -318,7 +318,7 @@
 >  
->  		dspi: dspi@2100000 {
+>  		dspi: dspi at 2100000 {
 >  			status = "disabled";
 > -			compatible = "fsl,vf610-dspi";
 > +			compatible = "fsl,ls2080a-dspi", "fsl,ls2085a-dspi";
@@ -49,7 +49,7 @@ On Tue, Jan 26, 2016 at 03:24:00PM +0800, Yuan Yao wrote:
 >  			reg = <0x0 0x2100000 0x0 0x10000>;
 > @@ -444,7 +444,7 @@
 >  
->  		qspi: quadspi@20c0000 {
+>  		qspi: quadspi at 20c0000 {
 >  			status = "disabled";
 > -			compatible = "fsl,vf610-qspi";
 > +			compatible = "fsl,ls2080a-qspi", "fsl,ls1021a-qspi";
diff --git a/a/content_digest b/N1/content_digest
index fe2716b..e85b2ae 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,18 +1,9 @@
  "ref\01453793041-35868-1-git-send-email-yao.yuan@freescale.com\0"
  "ref\01453793041-35868-6-git-send-email-yao.yuan@freescale.com\0"
- "From\0Han Xu <xhnjupt@gmail.com>\0"
- "Subject\0Re: [PATCH v4 6/7] dts/ls2080a: update the DTS for QSPI and DSPI support\0"
+ "From\0xhnjupt@gmail.com (Han Xu)\0"
+ "Subject\0[PATCH v4 6/7] dts/ls2080a: update the DTS for QSPI and DSPI support\0"
  "Date\0Thu, 18 Feb 2016 01:16:27 +0800\0"
- "To\0Yuan Yao <yao.yuan@freescale.com>\0"
- "Cc\0dwmw2@infradead.org"
-  computersforpeace@gmail.com
-  han.xu@freescale.com
-  robh@kernel.org
-  devicetree@vger.kernel.org
-  linux-kernel@vger.kernel.org
-  linux-mtd@lists.infradead.org
-  yao.yuan@nxp.com
- " linux-arm-kernel@lists.infradead.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Tue, Jan 26, 2016 at 03:24:00PM +0800, Yuan Yao wrote:\n"
@@ -40,14 +31,14 @@
  ">  &qspi {\n"
  ">  \tstatus = \"okay\";\n"
  "> -\tqflash0: s25fl008k {\n"
- "> +\tflash0: s25fl256s1@0 {\n"
+ "> +\tflash0: s25fl256s1 at 0 {\n"
  "> +\t\t#address-cells = <1>;\n"
  "> +\t\t#size-cells = <1>;\n"
  "> +\t\tcompatible = \"st,m25p80\";\n"
  "> +\t\tspi-max-frequency = <20000000>;\n"
  "> +\t\treg = <0>;\n"
  "> +\t};\n"
- "> +\tflash2: s25fl256s1@2 {\n"
+ "> +\tflash2: s25fl256s1 at 2 {\n"
  ">  \t\t#address-cells = <1>;\n"
  ">  \t\t#size-cells = <1>;\n"
  ">  \t\tcompatible = \"st,m25p80\";\n"
@@ -57,7 +48,7 @@
  "> +++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi\n"
  "> @@ -318,7 +318,7 @@\n"
  ">  \n"
- ">  \t\tdspi: dspi@2100000 {\n"
+ ">  \t\tdspi: dspi at 2100000 {\n"
  ">  \t\t\tstatus = \"disabled\";\n"
  "> -\t\t\tcompatible = \"fsl,vf610-dspi\";\n"
  "> +\t\t\tcompatible = \"fsl,ls2080a-dspi\", \"fsl,ls2085a-dspi\";\n"
@@ -66,7 +57,7 @@
  ">  \t\t\treg = <0x0 0x2100000 0x0 0x10000>;\n"
  "> @@ -444,7 +444,7 @@\n"
  ">  \n"
- ">  \t\tqspi: quadspi@20c0000 {\n"
+ ">  \t\tqspi: quadspi at 20c0000 {\n"
  ">  \t\t\tstatus = \"disabled\";\n"
  "> -\t\t\tcompatible = \"fsl,vf610-qspi\";\n"
  "> +\t\t\tcompatible = \"fsl,ls2080a-qspi\", \"fsl,ls1021a-qspi\";\n"
@@ -82,4 +73,4 @@
  "> Linux MTD discussion mailing list\n"
  > http://lists.infradead.org/mailman/listinfo/linux-mtd/
 
-401d04ff8e00a65c12904ddcb5cfac27aac4d6174a38cecec7d6dfbd65bc39fa
+0974c58e3de3204fc2050ce32b0a6eeae678f845251ccce402abffbd67d30afb
