diff for duplicates of <20160610202612.GP1256@tuxbot>

diff --git a/a/1.txt b/N1/1.txt
index cd5ec60..ac8e437 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -20,7 +20,7 @@ Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
 > +++ b/arch/arm/boot/dts/qcom-pma8084.dtsi
 > @@ -12,15 +12,15 @@
 >  
->  		rtc@6000 {
+>  		rtc at 6000 {
 >  			compatible = "qcom,pm8941-rtc";
 > -			reg = <0x6000 0x100>,
 > -			      <0x6100 0x100>;
@@ -30,7 +30,7 @@ Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
 >  			interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
 >  		};
 >  
->  		pma8084_gpios: gpios@c000 {
+>  		pma8084_gpios: gpios at c000 {
 >  			compatible = "qcom,pma8084-gpio", "qcom,spmi-gpio";
 > -			reg = <0xc000 0x1600>;
 > +			reg = <0xc000>;
@@ -39,7 +39,7 @@ Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
 >  			interrupts = <0 0xc0 0 IRQ_TYPE_NONE>,
 > @@ -49,7 +49,7 @@
 >  
->  		pma8084_mpps: mpps@a000 {
+>  		pma8084_mpps: mpps at a000 {
 >  			compatible = "qcom,pma8084-mpp", "qcom,spmi-mpp";
 > -			reg = <0xa000 0x800>;
 > +			reg = <0xa000>;
@@ -48,7 +48,7 @@ Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
 >  			interrupts = <0 0xa0 0 IRQ_TYPE_NONE>,
 > @@ -64,7 +64,7 @@
 >  
->  		pma8084_temp: temp-alarm@2400 {
+>  		pma8084_temp: temp-alarm at 2400 {
 >  			compatible = "qcom,spmi-temp-alarm";
 > -			reg = <0x2400 0x100>;
 > +			reg = <0x2400>;
@@ -57,7 +57,7 @@ Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
 >  			io-channels = <&pma8084_vadc VADC_DIE_TEMP>;
 > @@ -73,7 +73,7 @@
 >  
->  		pma8084_vadc: vadc@3100 {
+>  		pma8084_vadc: vadc at 3100 {
 >  			compatible = "qcom,spmi-vadc";
 > -			reg = <0x3100 0x100>;
 > +			reg = <0x3100>;
@@ -70,5 +70,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 4f236d6..7e9b429 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-5-git-send-email-andy.gross@linaro.org\0"
- "From\0Bjorn Andersson <bjorn.andersson@linaro.org>\0"
- "Subject\0Re: [PATCH 4/5] ARM: dts: qcom: Remove size elements from pmic reg\0"
+ "From\0bjorn.andersson@linaro.org (Bjorn Andersson)\0"
+ "Subject\0[PATCH 4/5] ARM: dts: qcom: Remove size elements from pmic reg\0"
  "Date\0Fri, 10 Jun 2016 13:26:12 -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"
@@ -32,7 +28,7 @@
  "> +++ b/arch/arm/boot/dts/qcom-pma8084.dtsi\n"
  "> @@ -12,15 +12,15 @@\n"
  ">  \n"
- ">  \t\trtc@6000 {\n"
+ ">  \t\trtc at 6000 {\n"
  ">  \t\t\tcompatible = \"qcom,pm8941-rtc\";\n"
  "> -\t\t\treg = <0x6000 0x100>,\n"
  "> -\t\t\t      <0x6100 0x100>;\n"
@@ -42,7 +38,7 @@
  ">  \t\t\tinterrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;\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 0x1600>;\n"
  "> +\t\t\treg = <0xc000>;\n"
@@ -51,7 +47,7 @@
  ">  \t\t\tinterrupts = <0 0xc0 0 IRQ_TYPE_NONE>,\n"
  "> @@ -49,7 +49,7 @@\n"
  ">  \n"
- ">  \t\tpma8084_mpps: mpps@a000 {\n"
+ ">  \t\tpma8084_mpps: mpps at a000 {\n"
  ">  \t\t\tcompatible = \"qcom,pma8084-mpp\", \"qcom,spmi-mpp\";\n"
  "> -\t\t\treg = <0xa000 0x800>;\n"
  "> +\t\t\treg = <0xa000>;\n"
@@ -60,7 +56,7 @@
  ">  \t\t\tinterrupts = <0 0xa0 0 IRQ_TYPE_NONE>,\n"
  "> @@ -64,7 +64,7 @@\n"
  ">  \n"
- ">  \t\tpma8084_temp: temp-alarm@2400 {\n"
+ ">  \t\tpma8084_temp: temp-alarm at 2400 {\n"
  ">  \t\t\tcompatible = \"qcom,spmi-temp-alarm\";\n"
  "> -\t\t\treg = <0x2400 0x100>;\n"
  "> +\t\t\treg = <0x2400>;\n"
@@ -69,7 +65,7 @@
  ">  \t\t\tio-channels = <&pma8084_vadc VADC_DIE_TEMP>;\n"
  "> @@ -73,7 +73,7 @@\n"
  ">  \n"
- ">  \t\tpma8084_vadc: vadc@3100 {\n"
+ ">  \t\tpma8084_vadc: vadc at 3100 {\n"
  ">  \t\t\tcompatible = \"qcom,spmi-vadc\";\n"
  "> -\t\t\treg = <0x3100 0x100>;\n"
  "> +\t\t\treg = <0x3100>;\n"
@@ -82,7 +78,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
 
-dbd7327c4d2a5e34f0a0e25b6685befec9c68ab870d130cab9e78785c9c8eead
+8b6280999536eeea3075d40fe89cbe51ccdfe49329acb63df53e6e91fac2930b
