diff for duplicates of <1407145148-29217-4-git-send-email-jingchang.lu@freescale.com>

diff --git a/a/1.txt b/N1/1.txt
index 5a4124e..b0dacd1 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -53,7 +53,7 @@ index 0000000..3b8cc08
 +		#address-cells = <1>;
 +		#size-cells = <0>;
 +
-+		reg_3p3v: regulator@0 {
++		reg_3p3v: regulator at 0 {
 +			compatible = "regulator-fixed";
 +			reg = <0>;
 +			regulator-name = "3P3V";
@@ -83,7 +83,7 @@ index 0000000..3b8cc08
 +	bus-num = <0>;
 +	status = "okay";
 +
-+	dspiflash: s25fl064k@0 {
++	dspiflash: s25fl064k at 0 {
 +		#address-cells = <1>;
 +		#size-cells = <1>;
 +		compatible = "spansion,s25fl064k";
@@ -121,7 +121,7 @@ index 0000000..3b8cc08
 +&i2c1 {
 +	status = "okay";
 +
-+	codec: sgtl5000@a {
++	codec: sgtl5000 at a {
 +		compatible = "fsl,sgtl5000";
 +		reg = <0x0a>;
 +		VDDA-supply = <&reg_3p3v>;
@@ -138,7 +138,7 @@ index 0000000..3b8cc08
 +	ranges = <0x0 0x0 0x0 0x60000000 0x08000000
 +		0x2 0x0 0x0 0x7fb00000 0x0000010>;
 +
-+		nor@0,0 {
++		nor at 0,0 {
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			compatible = "cfi-flash";
@@ -146,49 +146,49 @@ index 0000000..3b8cc08
 +			bank-width = <2>;
 +			device-width = <1>;
 +
-+			partition@0 {
++			partition at 0 {
 +				/* 128KB for rcw */
 +				reg = <0x00000000 0x0020000>;
 +				label = "NOR bank0 RCW Image";
 +			};
 +
-+			partition@20000 {
++			partition at 20000 {
 +				/* 1MB for DTB */
 +				reg = <0x00020000 0x00100000>;
 +				label = "NOR DTB Image";
 +			};
 +
-+			partition@120000 {
++			partition at 120000 {
 +				/* 8 MB for Linux Kernel Image */
 +				reg = <0x00120000 0x00800000>;
 +				label = "NOR Linux Kernel Image";
 +			};
 +
-+			partition@920000 {
++			partition at 920000 {
 +				/* 56MB for Ramdisk Root File System */
 +				reg = <0x00920000 0x03600000>;
 +				label = "NOR Ramdisk Root File System Image";
 +			};
 +
-+			partition@3f80000 {
++			partition at 3f80000 {
 +				/* 512KB for bank4 u-boot Image */
 +				reg = <0x03f80000 0x80000>;
 +				label = "NOR bank4 u-boot Image";
 +			};
 +
-+			partition@4000000 {
++			partition at 4000000 {
 +				/* 128KB for bank4 RCW Image */
 +				reg = <0x04000000 0x20000>;
 +				label = "NOR bank4 RCW Image";
 +			};
 +
-+			partition@4020000 {
++			partition at 4020000 {
 +				/* 63MB JFFS2 ROOT File System Image */
 +				reg = <0x04020000 0x3f00000>;
 +				label = "NOR JFFS2 ROOT File System Image";
 +			};
 +
-+			partition@7f80000 {
++			partition at 7f80000 {
 +				/* 512KB for bank0 u-boot Image */
 +				reg = <0x07f80000 0x80000>;
 +				label = "NOR bank0 u-boot Image";
@@ -201,16 +201,16 @@ index 0000000..3b8cc08
 +};
 +
 +&mdio0 {
-+	sgmii_phy0: ethernet-phy@0 {
++	sgmii_phy0: ethernet-phy at 0 {
 +		reg = <0x0>;
 +	};
-+	rgmii_phy1: ethernet-phy@1 {
++	rgmii_phy1: ethernet-phy at 1 {
 +		reg = <0x1>;
 +	};
-+	sgmii_phy2: ethernet-phy@2 {
++	sgmii_phy2: ethernet-phy at 2 {
 +		reg = <0x2>;
 +	};
-+	tbi1: tbi-phy@1f {
++	tbi1: tbi-phy at 1f {
 +		reg = <0x1f>;
 +		device_type = "tbi-phy";
 +	};
diff --git a/a/content_digest b/N1/content_digest
index 9928913..15f220d 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
   "ref\0001407145148-29217-1-git-send-email-jingchang.lu\@freescale.com\0"
 ]
 [
-  "From\0Jingchang Lu <jingchang.lu\@freescale.com>\0"
+  "From\0jingchang.lu\@freescale.com (Jingchang Lu)\0"
 ]
 [
   "Subject\0[PATCHv2 3/6] ARM: dts: Add initial LS1021A TWR board dts support\0"
@@ -11,15 +11,7 @@
   "Date\0Mon, 4 Aug 2014 17:39:05 +0800\0"
 ]
 [
-  "To\0shawn.guo\@freescale.com\0"
-]
-[
-  "Cc\0mark.rutland\@arm.com",
-  " devicetree\@vger.kernel.org",
-  " Chen Lu <B46807\@freescale.com>",
-  " Chao Fu <B44548\@freescale.com>",
-  " Jingchang Lu <jingchang.lu\@freescale.com>",
-  " linux-arm-kernel\@lists.infradead.org\0"
+  "To\0linux-arm-kernel\@lists.infradead.org\0"
 ]
 [
   "\0000:1\0"
@@ -83,7 +75,7 @@
   "+\t\t#address-cells = <1>;\n",
   "+\t\t#size-cells = <0>;\n",
   "+\n",
-  "+\t\treg_3p3v: regulator\@0 {\n",
+  "+\t\treg_3p3v: regulator at 0 {\n",
   "+\t\t\tcompatible = \"regulator-fixed\";\n",
   "+\t\t\treg = <0>;\n",
   "+\t\t\tregulator-name = \"3P3V\";\n",
@@ -113,7 +105,7 @@
   "+\tbus-num = <0>;\n",
   "+\tstatus = \"okay\";\n",
   "+\n",
-  "+\tdspiflash: s25fl064k\@0 {\n",
+  "+\tdspiflash: s25fl064k at 0 {\n",
   "+\t\t#address-cells = <1>;\n",
   "+\t\t#size-cells = <1>;\n",
   "+\t\tcompatible = \"spansion,s25fl064k\";\n",
@@ -151,7 +143,7 @@
   "+&i2c1 {\n",
   "+\tstatus = \"okay\";\n",
   "+\n",
-  "+\tcodec: sgtl5000\@a {\n",
+  "+\tcodec: sgtl5000 at a {\n",
   "+\t\tcompatible = \"fsl,sgtl5000\";\n",
   "+\t\treg = <0x0a>;\n",
   "+\t\tVDDA-supply = <&reg_3p3v>;\n",
@@ -168,7 +160,7 @@
   "+\tranges = <0x0 0x0 0x0 0x60000000 0x08000000\n",
   "+\t\t0x2 0x0 0x0 0x7fb00000 0x0000010>;\n",
   "+\n",
-  "+\t\tnor\@0,0 {\n",
+  "+\t\tnor at 0,0 {\n",
   "+\t\t\t#address-cells = <1>;\n",
   "+\t\t\t#size-cells = <1>;\n",
   "+\t\t\tcompatible = \"cfi-flash\";\n",
@@ -176,49 +168,49 @@
   "+\t\t\tbank-width = <2>;\n",
   "+\t\t\tdevice-width = <1>;\n",
   "+\n",
-  "+\t\t\tpartition\@0 {\n",
+  "+\t\t\tpartition at 0 {\n",
   "+\t\t\t\t/* 128KB for rcw */\n",
   "+\t\t\t\treg = <0x00000000 0x0020000>;\n",
   "+\t\t\t\tlabel = \"NOR bank0 RCW Image\";\n",
   "+\t\t\t};\n",
   "+\n",
-  "+\t\t\tpartition\@20000 {\n",
+  "+\t\t\tpartition at 20000 {\n",
   "+\t\t\t\t/* 1MB for DTB */\n",
   "+\t\t\t\treg = <0x00020000 0x00100000>;\n",
   "+\t\t\t\tlabel = \"NOR DTB Image\";\n",
   "+\t\t\t};\n",
   "+\n",
-  "+\t\t\tpartition\@120000 {\n",
+  "+\t\t\tpartition at 120000 {\n",
   "+\t\t\t\t/* 8 MB for Linux Kernel Image */\n",
   "+\t\t\t\treg = <0x00120000 0x00800000>;\n",
   "+\t\t\t\tlabel = \"NOR Linux Kernel Image\";\n",
   "+\t\t\t};\n",
   "+\n",
-  "+\t\t\tpartition\@920000 {\n",
+  "+\t\t\tpartition at 920000 {\n",
   "+\t\t\t\t/* 56MB for Ramdisk Root File System */\n",
   "+\t\t\t\treg = <0x00920000 0x03600000>;\n",
   "+\t\t\t\tlabel = \"NOR Ramdisk Root File System Image\";\n",
   "+\t\t\t};\n",
   "+\n",
-  "+\t\t\tpartition\@3f80000 {\n",
+  "+\t\t\tpartition at 3f80000 {\n",
   "+\t\t\t\t/* 512KB for bank4 u-boot Image */\n",
   "+\t\t\t\treg = <0x03f80000 0x80000>;\n",
   "+\t\t\t\tlabel = \"NOR bank4 u-boot Image\";\n",
   "+\t\t\t};\n",
   "+\n",
-  "+\t\t\tpartition\@4000000 {\n",
+  "+\t\t\tpartition at 4000000 {\n",
   "+\t\t\t\t/* 128KB for bank4 RCW Image */\n",
   "+\t\t\t\treg = <0x04000000 0x20000>;\n",
   "+\t\t\t\tlabel = \"NOR bank4 RCW Image\";\n",
   "+\t\t\t};\n",
   "+\n",
-  "+\t\t\tpartition\@4020000 {\n",
+  "+\t\t\tpartition at 4020000 {\n",
   "+\t\t\t\t/* 63MB JFFS2 ROOT File System Image */\n",
   "+\t\t\t\treg = <0x04020000 0x3f00000>;\n",
   "+\t\t\t\tlabel = \"NOR JFFS2 ROOT File System Image\";\n",
   "+\t\t\t};\n",
   "+\n",
-  "+\t\t\tpartition\@7f80000 {\n",
+  "+\t\t\tpartition at 7f80000 {\n",
   "+\t\t\t\t/* 512KB for bank0 u-boot Image */\n",
   "+\t\t\t\treg = <0x07f80000 0x80000>;\n",
   "+\t\t\t\tlabel = \"NOR bank0 u-boot Image\";\n",
@@ -231,16 +223,16 @@
   "+};\n",
   "+\n",
   "+&mdio0 {\n",
-  "+\tsgmii_phy0: ethernet-phy\@0 {\n",
+  "+\tsgmii_phy0: ethernet-phy at 0 {\n",
   "+\t\treg = <0x0>;\n",
   "+\t};\n",
-  "+\trgmii_phy1: ethernet-phy\@1 {\n",
+  "+\trgmii_phy1: ethernet-phy at 1 {\n",
   "+\t\treg = <0x1>;\n",
   "+\t};\n",
-  "+\tsgmii_phy2: ethernet-phy\@2 {\n",
+  "+\tsgmii_phy2: ethernet-phy at 2 {\n",
   "+\t\treg = <0x2>;\n",
   "+\t};\n",
-  "+\ttbi1: tbi-phy\@1f {\n",
+  "+\ttbi1: tbi-phy at 1f {\n",
   "+\t\treg = <0x1f>;\n",
   "+\t\tdevice_type = \"tbi-phy\";\n",
   "+\t};\n",
@@ -265,4 +257,4 @@
   "1.8.0"
 ]
 
-2e7e105a7a1d385e155e49fc259133b962774210c2b8dbedfb6cd63f0687ab10
+130fce9bf2eebfea9a2fc7436b272f6e1fd48432768544bf9f54b53f618ebed7
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.