diff for duplicates of <20160610202914.GQ1256@tuxbot>

diff --git a/a/1.txt b/N1/1.txt
index f0284f4..6b506b0 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -18,7 +18,7 @@ Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
 >  			interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
 >  		};
 >  
-> +		pwrkey@800 {
+> +		pwrkey at 800 {
 > +			compatible = "qcom,pm8941-pwrkey";
 > +			reg = <0x800>;
 > +			interrupts = <0x0 0x8 0 IRQ_TYPE_EDGE_BOTH>;
@@ -26,7 +26,7 @@ Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
 > +			bias-pull-up;
 > +		};
 > +
->  		pma8084_gpios: gpios@c000 {
+>  		pma8084_gpios: gpios at c000 {
 >  			compatible = "qcom,pma8084-gpio", "qcom,spmi-gpio";
 >  			reg = <0xc000>;
 > -- 
@@ -35,5 +35,5 @@ Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
 > 
 > _______________________________________________
 > 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 d4f5d9e..7318c00 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,13 +1,9 @@
  "ref\01463634020-17252-1-git-send-email-andy.gross@linaro.org\0"
  "ref\01463634020-17252-6-git-send-email-andy.gross@linaro.org\0"
- "From\0Bjorn Andersson <bjorn.andersson@linaro.org>\0"
- "Subject\0Re: [PATCH 5/5] ARM: dts: qcom: pma8084: Add pwrkey entry\0"
+ "From\0bjorn.andersson@linaro.org (Bjorn Andersson)\0"
+ "Subject\0[PATCH 5/5] ARM: dts: qcom: pma8084: Add pwrkey entry\0"
  "Date\0Fri, 10 Jun 2016 13:29:14 -0700\0"
- "To\0Andy Gross <andy.gross@linaro.org>\0"
- "Cc\0linux-pm@vger.kernel.org"
-  linux-arm-msm@vger.kernel.org
-  stanimir.varbanov@linaro.org
- " linux-arm-kernel@lists.infradead.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Wed 18 May 22:00 PDT 2016, Andy Gross wrote:\n"
@@ -30,7 +26,7 @@
  ">  \t\t\tinterrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;\n"
  ">  \t\t};\n"
  ">  \n"
- "> +\t\tpwrkey@800 {\n"
+ "> +\t\tpwrkey at 800 {\n"
  "> +\t\t\tcompatible = \"qcom,pm8941-pwrkey\";\n"
  "> +\t\t\treg = <0x800>;\n"
  "> +\t\t\tinterrupts = <0x0 0x8 0 IRQ_TYPE_EDGE_BOTH>;\n"
@@ -38,7 +34,7 @@
  "> +\t\t\tbias-pull-up;\n"
  "> +\t\t};\n"
  "> +\n"
- ">  \t\tpma8084_gpios: gpios@c000 {\n"
+ ">  \t\tpma8084_gpios: gpios at c000 {\n"
  ">  \t\t\tcompatible = \"qcom,pma8084-gpio\", \"qcom,spmi-gpio\";\n"
  ">  \t\t\treg = <0xc000>;\n"
  "> -- \n"
@@ -47,7 +43,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
 
-bf5d571a0ef067711b79903b33481d24c8e9a220efde6dcd57445af85281b337
+18043a2bd9769d0ecc49f09552ff580f02dc1ee7ae0c078bc6199c6b26bde7c2
