diff for duplicates of <20151123161429.2a3a9243@xhacker>

diff --git a/a/1.txt b/N1/1.txt
index 82986a4..ae8aaa5 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -56,7 +56,7 @@ Jisheng Zhang wrote:
 > > > +			bypass-shift = /bits/ 8 <1>;
 > > > +		};
 > > > +
-> > >  		apb@e80000 {
+> > >  		apb at e80000 {
 > > >  			compatible = "simple-bus";
 > > >  			#address-cells = <1>;
 > > > @@ -225,6 +242,27 @@
@@ -226,7 +226,7 @@ Jisheng
 > > > +			clocks = <&syspll>;
 > > > +		};
 > > > +
-> > >  		soc_pinctrl: pin-controller@ea8000 {
+> > >  		soc_pinctrl: pin-controller at ea8000 {
 > > >  			compatible = "marvell,berlin4ct-soc-pinctrl";
 > > >  			reg = <0xea8000 0x14>;
 > > >     
@@ -235,5 +235,5 @@ Jisheng
 > 
 > _______________________________________________
 > 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 71083bf..ebcf4df 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,24 +2,10 @@
  "ref\01448008952-1787-7-git-send-email-jszhang@marvell.com\0"
  "ref\0564F8B73.7070403@gmail.com\0"
  "ref\020151123152158.483aa6b5@xhacker\0"
- "From\0Jisheng Zhang <jszhang@marvell.com>\0"
- "Subject\0Re: [PATCH v2 6/6] arm64: dts: berlin4ct: add pll and clock nodes\0"
+ "From\0jszhang@marvell.com (Jisheng Zhang)\0"
+ "Subject\0[PATCH v2 6/6] arm64: dts: berlin4ct: add pll and clock nodes\0"
  "Date\0Mon, 23 Nov 2015 16:14:29 +0800\0"
- "To\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0"
- "Cc\0<mark.rutland@arm.com>"
-  <devicetree@vger.kernel.org>
-  <pawel.moll@arm.com>
-  <ijc+devicetree@hellion.org.uk>
-  <catalin.marinas@arm.com>
-  <mturquette@baylibre.com>
-  <will.deacon@arm.com>
-  <linux-kernel@vger.kernel.org>
-  <linux-clk@vger.kernel.org>
-  <antoine.tenart@free-electrons.com>
-  <robh+dt@kernel.org>
-  <galak@codeaurora.org>
-  <sboyd@codeaurora.org>
- " <linux-arm-kernel@lists.infradead.org>\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Dear all,\n"
@@ -80,7 +66,7 @@
  "> > > +\t\t\tbypass-shift = /bits/ 8 <1>;\n"
  "> > > +\t\t};\n"
  "> > > +\n"
- "> > >  \t\tapb@e80000 {\n"
+ "> > >  \t\tapb at e80000 {\n"
  "> > >  \t\t\tcompatible = \"simple-bus\";\n"
  "> > >  \t\t\t#address-cells = <1>;\n"
  "> > > @@ -225,6 +242,27 @@\n"
@@ -250,7 +236,7 @@
  "> > > +\t\t\tclocks = <&syspll>;\n"
  "> > > +\t\t};\n"
  "> > > +\n"
- "> > >  \t\tsoc_pinctrl: pin-controller@ea8000 {\n"
+ "> > >  \t\tsoc_pinctrl: pin-controller at ea8000 {\n"
  "> > >  \t\t\tcompatible = \"marvell,berlin4ct-soc-pinctrl\";\n"
  "> > >  \t\t\treg = <0xea8000 0x14>;\n"
  "> > >     \n"
@@ -259,7 +245,7 @@
  "> \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
 
-aa14972ac28d241f5260cb59aa7853cc30065a340384c188d7ac7cf0248669da
+5c34e4f6e033f92e9111836b45b7a5475e731b7f82ca675c06170fedf8933113
