diff for duplicates of <20160808083005.GD4678@tiger>

diff --git a/a/1.txt b/N1/1.txt
index e8cd589..da75672 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -11,7 +11,7 @@ On Wed, Jun 29, 2016 at 06:32:26AM -0700, Tim Harvey wrote:
 
 Is this change related?
 
->  		reg_1p8v: regulator at 1 {
+>  		reg_1p8v: regulator@1 {
 >  			compatible = "regulator-fixed";
 >  			reg = <1>;
 > diff --git a/arch/arm/boot/dts/imx6qdl-gw553x.dtsi b/arch/arm/boot/dts/imx6qdl-gw553x.dtsi
@@ -74,7 +74,7 @@ nodes directly under root with following naming schema.
 	};
 
 > +
-> +		reg_3p3v: regulator at 0 {
+> +		reg_3p3v: regulator@0 {
 > +			compatible = "regulator-fixed";
 > +			reg = <0>;
 > +			regulator-name = "3P0V";
@@ -83,7 +83,7 @@ nodes directly under root with following naming schema.
 > +			regulator-always-on;
 > +		};
 > +
-> +		reg_5p0v: regulator at 1 {
+> +		reg_5p0v: regulator@1 {
 > +			compatible = "regulator-fixed";
 > +			reg = <1>;
 > +			regulator-name = "5P0V";
@@ -92,7 +92,7 @@ nodes directly under root with following naming schema.
 > +			regulator-always-on;
 > +		};
 > +
-> +		reg_usb_otg_vbus: regulator at 2 {
+> +		reg_usb_otg_vbus: regulator@2 {
 > +			compatible = "regulator-fixed";
 > +			reg = <2>;
 > +			regulator-name = "usb_otg_vbus";
@@ -123,31 +123,31 @@ nodes directly under root with following naming schema.
 > +	pinctrl-0 = <&pinctrl_i2c1>;
 > +	status = "okay";
 > +
-> +	eeprom1: eeprom at 50 {
+> +	eeprom1: eeprom@50 {
 > +		compatible = "atmel,24c02";
 > +		reg = <0x50>;
 > +		pagesize = <16>;
 > +	};
 > +
-> +	eeprom2: eeprom at 51 {
+> +	eeprom2: eeprom@51 {
 > +		compatible = "atmel,24c02";
 > +		reg = <0x51>;
 > +		pagesize = <16>;
 > +	};
 > +
-> +	eeprom3: eeprom at 52 {
+> +	eeprom3: eeprom@52 {
 > +		compatible = "atmel,24c02";
 > +		reg = <0x52>;
 > +		pagesize = <16>;
 > +	};
 > +
-> +	eeprom4: eeprom at 53 {
+> +	eeprom4: eeprom@53 {
 > +		compatible = "atmel,24c02";
 > +		reg = <0x53>;
 > +		pagesize = <16>;
 > +	};
 > +
-> +	gpio: pca9555 at 23 {
+> +	gpio: pca9555@23 {
 > +		compatible = "nxp,pca9555";
 > +		reg = <0x23>;
 > +		gpio-controller;
@@ -155,10 +155,10 @@ nodes directly under root with following naming schema.
 > +	};
 
 We generally sort the device nodes under I2C bus in order of slave
-address.  That said, this pca9555 at 23 node should go before eeprom at 50.
+address.  That said, this pca9555@23 node should go before eeprom@50.
 
 > +
-> +	rtc: ds1672 at 68 {
+> +	rtc: ds1672@68 {
 > +		compatible = "dallas,ds1672";
 > +		reg = <0x68>;
 > +	};
@@ -346,5 +346,9 @@ Shawn
 > 
 > _______________________________________________
 > linux-arm-kernel mailing list
-> linux-arm-kernel at lists.infradead.org
+> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
 > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+--
+To unsubscribe from this list: send the line "unsubscribe devicetree" in
+the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/a/content_digest b/N1/content_digest
index 9ef9426..a6d2784 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,11 @@
  "ref\01467207146-4842-1-git-send-email-tharvey@gateworks.com\0"
- "From\0shawnguo@kernel.org (Shawn Guo)\0"
- "Subject\0[PATCH v2] ARM: dts: imx: add Gateworks Ventana GW553x support\0"
+ "ref\01467207146-4842-1-git-send-email-tharvey-UMMOYl/HMS+akBO8gow8eQ@public.gmane.org\0"
+ "From\0Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0"
+ "Subject\0Re: [PATCH v2] ARM: dts: imx: add Gateworks Ventana GW553x support\0"
  "Date\0Mon, 8 Aug 2016 16:30:05 +0800\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Tim Harvey <tharvey-UMMOYl/HMS+akBO8gow8eQ@public.gmane.org>\0"
+ "Cc\0devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
+ " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0"
  "\00:1\0"
  "b\0"
  "On Wed, Jun 29, 2016 at 06:32:26AM -0700, Tim Harvey wrote:\n"
@@ -18,7 +21,7 @@
  "\n"
  "Is this change related?\n"
  "\n"
- ">  \t\treg_1p8v: regulator at 1 {\n"
+ ">  \t\treg_1p8v: regulator@1 {\n"
  ">  \t\t\tcompatible = \"regulator-fixed\";\n"
  ">  \t\t\treg = <1>;\n"
  "> diff --git a/arch/arm/boot/dts/imx6qdl-gw553x.dtsi b/arch/arm/boot/dts/imx6qdl-gw553x.dtsi\n"
@@ -81,7 +84,7 @@
  "\t};\n"
  "\n"
  "> +\n"
- "> +\t\treg_3p3v: regulator at 0 {\n"
+ "> +\t\treg_3p3v: regulator@0 {\n"
  "> +\t\t\tcompatible = \"regulator-fixed\";\n"
  "> +\t\t\treg = <0>;\n"
  "> +\t\t\tregulator-name = \"3P0V\";\n"
@@ -90,7 +93,7 @@
  "> +\t\t\tregulator-always-on;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\treg_5p0v: regulator at 1 {\n"
+ "> +\t\treg_5p0v: regulator@1 {\n"
  "> +\t\t\tcompatible = \"regulator-fixed\";\n"
  "> +\t\t\treg = <1>;\n"
  "> +\t\t\tregulator-name = \"5P0V\";\n"
@@ -99,7 +102,7 @@
  "> +\t\t\tregulator-always-on;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\treg_usb_otg_vbus: regulator at 2 {\n"
+ "> +\t\treg_usb_otg_vbus: regulator@2 {\n"
  "> +\t\t\tcompatible = \"regulator-fixed\";\n"
  "> +\t\t\treg = <2>;\n"
  "> +\t\t\tregulator-name = \"usb_otg_vbus\";\n"
@@ -130,31 +133,31 @@
  "> +\tpinctrl-0 = <&pinctrl_i2c1>;\n"
  "> +\tstatus = \"okay\";\n"
  "> +\n"
- "> +\teeprom1: eeprom at 50 {\n"
+ "> +\teeprom1: eeprom@50 {\n"
  "> +\t\tcompatible = \"atmel,24c02\";\n"
  "> +\t\treg = <0x50>;\n"
  "> +\t\tpagesize = <16>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\teeprom2: eeprom at 51 {\n"
+ "> +\teeprom2: eeprom@51 {\n"
  "> +\t\tcompatible = \"atmel,24c02\";\n"
  "> +\t\treg = <0x51>;\n"
  "> +\t\tpagesize = <16>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\teeprom3: eeprom at 52 {\n"
+ "> +\teeprom3: eeprom@52 {\n"
  "> +\t\tcompatible = \"atmel,24c02\";\n"
  "> +\t\treg = <0x52>;\n"
  "> +\t\tpagesize = <16>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\teeprom4: eeprom at 53 {\n"
+ "> +\teeprom4: eeprom@53 {\n"
  "> +\t\tcompatible = \"atmel,24c02\";\n"
  "> +\t\treg = <0x53>;\n"
  "> +\t\tpagesize = <16>;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tgpio: pca9555 at 23 {\n"
+ "> +\tgpio: pca9555@23 {\n"
  "> +\t\tcompatible = \"nxp,pca9555\";\n"
  "> +\t\treg = <0x23>;\n"
  "> +\t\tgpio-controller;\n"
@@ -162,10 +165,10 @@
  "> +\t};\n"
  "\n"
  "We generally sort the device nodes under I2C bus in order of slave\n"
- "address.  That said, this pca9555 at 23 node should go before eeprom at 50.\n"
+ "address.  That said, this pca9555@23 node should go before eeprom@50.\n"
  "\n"
  "> +\n"
- "> +\trtc: ds1672 at 68 {\n"
+ "> +\trtc: ds1672@68 {\n"
  "> +\t\tcompatible = \"dallas,ds1672\";\n"
  "> +\t\treg = <0x68>;\n"
  "> +\t};\n"
@@ -353,7 +356,11 @@
  "> \n"
  "> _______________________________________________\n"
  "> linux-arm-kernel mailing list\n"
- "> linux-arm-kernel at lists.infradead.org\n"
- > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+ "> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\n"
+ "> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\n"
+ "--\n"
+ "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n"
+ "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n"
+ More majordomo info at  http://vger.kernel.org/majordomo-info.html
 
-4d5d3ab4b1c574a90375f925bbe5cabdebc6b5ef3bcf15db248e1dc1cad8d1d7
+69f19679bab76e7ccb4b4289a36df189388ccb8e7ff8ee13a3e8e1110d54ee54
