diff for duplicates of <20161105074350.GD5597@dragon>

diff --git a/a/1.txt b/N1/1.txt
index 88fef67..57a14ea 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -25,12 +25,12 @@ compatible.
 > --- a/arch/arm/boot/dts/imx6qp.dtsi
 > +++ b/arch/arm/boot/dts/imx6qp.dtsi
 > @@ -85,5 +85,12 @@
->  		pcie: pcie at 0x01000000 {
+>  		pcie: pcie@0x01000000 {
 >  			compatible = "fsl,imx6qp-pcie", "snps,dw-pcie";
 >  		};
 > +
-> +		aips-bus at 02100000 {
-> +			mmdc0: mmdc at 021b0000 { /* MMDC0 */
+> +		aips-bus@02100000 {
+> +			mmdc0: mmdc@021b0000 { /* MMDC0 */
 > +				compatible = "fsl,imx6qp-mmdc", "fsl,imx6q-mmdc";
 > +				reg = <0x021b0000 0x4000>;
 > +			};
@@ -49,5 +49,5 @@ Shawn
 > 
 > _______________________________________________
 > 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 d587939..39b11e9 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,9 +1,17 @@
  "ref\01478109604-18323-1-git-send-email-Frank.Li@nxp.com\0"
  "ref\01478109604-18323-2-git-send-email-Frank.Li@nxp.com\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH V2 2/2] ARM: dts: add new compatible stream for i.MX6QP mmdc\0"
+ "From\0Shawn Guo <shawnguo@kernel.org>\0"
+ "Subject\0Re: [PATCH V2 2/2] ARM: dts: add new compatible stream for i.MX6QP mmdc\0"
  "Date\0Sat, 5 Nov 2016 15:43:52 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Frank Li <Frank.Li@nxp.com>\0"
+ "Cc\0mark.rutland@arm.com"
+  peterz@infradead.org
+  linux-kernel@vger.kernel.org
+  acme@kernel.org
+  alexander.shishkin@linux.intel.com
+  mingo@redhat.com
+  lznuaa@gmail.com
+ " linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Wed, Nov 02, 2016 at 01:00:04PM -0500, Frank Li wrote:\n"
@@ -33,12 +41,12 @@
  "> --- a/arch/arm/boot/dts/imx6qp.dtsi\n"
  "> +++ b/arch/arm/boot/dts/imx6qp.dtsi\n"
  "> @@ -85,5 +85,12 @@\n"
- ">  \t\tpcie: pcie at 0x01000000 {\n"
+ ">  \t\tpcie: pcie@0x01000000 {\n"
  ">  \t\t\tcompatible = \"fsl,imx6qp-pcie\", \"snps,dw-pcie\";\n"
  ">  \t\t};\n"
  "> +\n"
- "> +\t\taips-bus at 02100000 {\n"
- "> +\t\t\tmmdc0: mmdc at 021b0000 { /* MMDC0 */\n"
+ "> +\t\taips-bus@02100000 {\n"
+ "> +\t\t\tmmdc0: mmdc@021b0000 { /* MMDC0 */\n"
  "> +\t\t\t\tcompatible = \"fsl,imx6qp-mmdc\", \"fsl,imx6q-mmdc\";\n"
  "> +\t\t\t\treg = <0x021b0000 0x4000>;\n"
  "> +\t\t\t};\n"
@@ -57,7 +65,7 @@
  "> \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
 
-d7b30fc6fb87519a30aeb494925146594332811aa24c9ecccb7cfd2766e90292
+5f45f256ed6fa49dba96444251f8f2108f855d89fcc65d2f82c37479aa91d4bf
