diff for duplicates of <4FD61BD2.8050802@gmail.com>

diff --git a/a/1.txt b/N1/1.txt
index fc5065a..6d3193f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -81,7 +81,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	tegra_i2s2: i2s at 70002a00 {
+>  	tegra_i2s2: i2s@70002a00 {
 > @@ -80,7 +80,7 @@
 >  		reg = <0x70002a00 0x200>;
 >  		interrupts = <0 3 0x04>;
@@ -90,7 +90,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	serial at 70006000 {
+>  	serial@70006000 {
 > @@ -88,7 +88,7 @@
 >  		reg = <0x70006000 0x40>;
 >  		reg-shift = <2>;
@@ -99,7 +99,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	serial at 70006040 {
+>  	serial@70006040 {
 > @@ -96,7 +96,7 @@
 >  		reg = <0x70006040 0x40>;
 >  		reg-shift = <2>;
@@ -108,7 +108,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	serial at 70006200 {
+>  	serial@70006200 {
 > @@ -104,7 +104,7 @@
 >  		reg = <0x70006200 0x100>;
 >  		reg-shift = <2>;
@@ -117,7 +117,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	serial at 70006300 {
+>  	serial@70006300 {
 > @@ -112,7 +112,7 @@
 >  		reg = <0x70006300 0x100>;
 >  		reg-shift = <2>;
@@ -126,7 +126,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	serial at 70006400 {
+>  	serial@70006400 {
 > @@ -120,7 +120,7 @@
 >  		reg = <0x70006400 0x100>;
 >  		reg-shift = <2>;
@@ -135,7 +135,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	i2c at 7000c000 {
+>  	i2c@7000c000 {
 > @@ -129,7 +129,7 @@
 >  		interrupts = <0 38 0x04>;
 >  		#address-cells = <1>;
@@ -144,7 +144,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	i2c at 7000c400 {
+>  	i2c@7000c400 {
 > @@ -138,7 +138,7 @@
 >  		interrupts = <0 84 0x04>;
 >  		#address-cells = <1>;
@@ -153,7 +153,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	i2c at 7000c500 {
+>  	i2c@7000c500 {
 > @@ -147,7 +147,7 @@
 >  		interrupts = <0 92 0x04>;
 >  		#address-cells = <1>;
@@ -162,7 +162,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	i2c at 7000d000 {
+>  	i2c@7000d000 {
 > @@ -156,7 +156,7 @@
 >  		interrupts = <0 53 0x04>;
 >  		#address-cells = <1>;
@@ -180,7 +180,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	usb at c5004000 {
+>  	usb@c5004000 {
 > @@ -198,7 +198,7 @@
 >  		reg = <0xc5004000 0x4000>;
 >  		interrupts = <0 21 0x04>;
@@ -189,7 +189,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	usb at c5008000 {
+>  	usb@c5008000 {
 > @@ -206,35 +206,35 @@
 >  		reg = <0xc5008000 0x4000>;
 >  		interrupts = <0 97 0x04>;
@@ -198,7 +198,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	sdhci at c8000000 {
+>  	sdhci@c8000000 {
 >  		compatible = "nvidia,tegra20-sdhci";
 >  		reg = <0xc8000000 0x200>;
 >  		interrupts = <0 14 0x04>;
@@ -206,7 +206,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	sdhci at c8000200 {
+>  	sdhci@c8000200 {
 >  		compatible = "nvidia,tegra20-sdhci";
 >  		reg = <0xc8000200 0x200>;
 >  		interrupts = <0 15 0x04>;
@@ -214,7 +214,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	sdhci at c8000400 {
+>  	sdhci@c8000400 {
 >  		compatible = "nvidia,tegra20-sdhci";
 >  		reg = <0xc8000400 0x200>;
 >  		interrupts = <0 19 0x04>;
@@ -222,7 +222,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	sdhci at c8000600 {
+>  	sdhci@c8000600 {
 >  		compatible = "nvidia,tegra20-sdhci";
 >  		reg = <0xc8000600 0x200>;
 >  		interrupts = <0 31 0x04>;
@@ -241,7 +241,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	serial at 70006040 {
+>  	serial@70006040 {
 > @@ -90,7 +90,7 @@
 >  		reg = <0x70006040 0x40>;
 >  		reg-shift = <2>;
@@ -250,7 +250,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	serial at 70006200 {
+>  	serial@70006200 {
 > @@ -98,7 +98,7 @@
 >  		reg = <0x70006200 0x100>;
 >  		reg-shift = <2>;
@@ -259,7 +259,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	serial at 70006300 {
+>  	serial@70006300 {
 > @@ -106,7 +106,7 @@
 >  		reg = <0x70006300 0x100>;
 >  		reg-shift = <2>;
@@ -268,7 +268,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	serial at 70006400 {
+>  	serial@70006400 {
 > @@ -114,7 +114,7 @@
 >  		reg = <0x70006400 0x100>;
 >  		reg-shift = <2>;
@@ -277,7 +277,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	i2c at 7000c000 {
+>  	i2c@7000c000 {
 > @@ -123,7 +123,7 @@
 >  		interrupts = <0 38 0x04>;
 >  		#address-cells = <1>;
@@ -286,7 +286,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	i2c at 7000c400 {
+>  	i2c@7000c400 {
 > @@ -132,7 +132,7 @@
 >  		interrupts = <0 84 0x04>;
 >  		#address-cells = <1>;
@@ -295,7 +295,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	i2c at 7000c500 {
+>  	i2c@7000c500 {
 > @@ -141,7 +141,7 @@
 >  		interrupts = <0 92 0x04>;
 >  		#address-cells = <1>;
@@ -304,7 +304,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	i2c at 7000c700 {
+>  	i2c@7000c700 {
 > @@ -150,7 +150,7 @@
 >  		interrupts = <0 120 0x04>;
 >  		#address-cells = <1>;
@@ -313,7 +313,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	i2c at 7000d000 {
+>  	i2c@7000d000 {
 > @@ -159,7 +159,7 @@
 >  		interrupts = <0 53 0x04>;
 >  		#address-cells = <1>;
@@ -331,7 +331,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +			status = "disabled";
 >  		};
 >  
->  		tegra_i2s1: i2s at 70080400 {
+>  		tegra_i2s1: i2s@70080400 {
 >  			compatible = "nvidia,tegra30-i2s";
 >  			reg = <0x70080400 0x100>;
 >  			nvidia,ahub-cif-ids = <5 5>;
@@ -339,7 +339,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +			status = "disabled";
 >  		};
 >  
->  		tegra_i2s2: i2s at 70080500 {
+>  		tegra_i2s2: i2s@70080500 {
 >  			compatible = "nvidia,tegra30-i2s";
 >  			reg = <0x70080500 0x100>;
 >  			nvidia,ahub-cif-ids = <6 6>;
@@ -347,7 +347,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +			status = "disabled";
 >  		};
 >  
->  		tegra_i2s3: i2s at 70080600 {
+>  		tegra_i2s3: i2s@70080600 {
 >  			compatible = "nvidia,tegra30-i2s";
 >  			reg = <0x70080600 0x100>;
 >  			nvidia,ahub-cif-ids = <7 7>;
@@ -355,7 +355,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +			status = "disabled";
 >  		};
 >  
->  		tegra_i2s4: i2s at 70080700 {
+>  		tegra_i2s4: i2s@70080700 {
 >  			compatible = "nvidia,tegra30-i2s";
 >  			reg = <0x70080700 0x100>;
 >  			nvidia,ahub-cif-ids = <8 8>;
@@ -372,7 +372,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	sdhci at 78000200 {
+>  	sdhci@78000200 {
 >  		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
 >  		reg = <0x78000200 0x200>;
 >  		interrupts = <0 15 0x04>;
@@ -380,7 +380,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	sdhci at 78000400 {
+>  	sdhci@78000400 {
 >  		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
 >  		reg = <0x78000400 0x200>;
 >  		interrupts = <0 19 0x04>;
@@ -388,7 +388,7 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > +		status = "disabled";
 >  	};
 >  
->  	sdhci at 78000600 {
+>  	sdhci@78000600 {
 >  		compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
 >  		reg = <0x78000600 0x200>;
 >  		interrupts = <0 31 0x04>;
@@ -400,5 +400,5 @@ Acked-by: Rob Herring <rob.herring@calxeda.com>
 > 
 > _______________________________________________
 > linux-arm-kernel mailing list
-> linux-arm-kernel at lists.infradead.org
+> linux-arm-kernel@lists.infradead.org
 > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/a/content_digest b/N1/content_digest
index 29881ec..abbcbea 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,14 @@
  "ref\01339427460-23007-1-git-send-email-stigge@antcom.de\0"
- "From\0robherring2@gmail.com (Rob Herring)\0"
- "Subject\0[PATCH] ARM: Fix dts files w/ status property: \"disable\" -> \"disabled\"\0"
+ "From\0Rob Herring <robherring2@gmail.com>\0"
+ "Subject\0Re: [PATCH] ARM: Fix dts files w/ status property: \"disable\" -> \"disabled\"\0"
  "Date\0Mon, 11 Jun 2012 11:24:50 -0500\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Roland Stigge <stigge@antcom.de>\0"
+ "Cc\0arm@kernel.org"
+  linux-arm-kernel@lists.infradead.org
+  linux-kernel@vger.kernel.org
+  b-cousson@ti.com
+  grant.likely@secretlab.ca
+ " rob.herring@calxeda.com\0"
  "\00:1\0"
  "b\0"
  "On 06/11/2012 10:11 AM, Roland Stigge wrote:\n"
@@ -88,7 +94,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \ttegra_i2s2: i2s at 70002a00 {\n"
+ ">  \ttegra_i2s2: i2s@70002a00 {\n"
  "> @@ -80,7 +80,7 @@\n"
  ">  \t\treg = <0x70002a00 0x200>;\n"
  ">  \t\tinterrupts = <0 3 0x04>;\n"
@@ -97,7 +103,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tserial at 70006000 {\n"
+ ">  \tserial@70006000 {\n"
  "> @@ -88,7 +88,7 @@\n"
  ">  \t\treg = <0x70006000 0x40>;\n"
  ">  \t\treg-shift = <2>;\n"
@@ -106,7 +112,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tserial at 70006040 {\n"
+ ">  \tserial@70006040 {\n"
  "> @@ -96,7 +96,7 @@\n"
  ">  \t\treg = <0x70006040 0x40>;\n"
  ">  \t\treg-shift = <2>;\n"
@@ -115,7 +121,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tserial at 70006200 {\n"
+ ">  \tserial@70006200 {\n"
  "> @@ -104,7 +104,7 @@\n"
  ">  \t\treg = <0x70006200 0x100>;\n"
  ">  \t\treg-shift = <2>;\n"
@@ -124,7 +130,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tserial at 70006300 {\n"
+ ">  \tserial@70006300 {\n"
  "> @@ -112,7 +112,7 @@\n"
  ">  \t\treg = <0x70006300 0x100>;\n"
  ">  \t\treg-shift = <2>;\n"
@@ -133,7 +139,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tserial at 70006400 {\n"
+ ">  \tserial@70006400 {\n"
  "> @@ -120,7 +120,7 @@\n"
  ">  \t\treg = <0x70006400 0x100>;\n"
  ">  \t\treg-shift = <2>;\n"
@@ -142,7 +148,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \ti2c at 7000c000 {\n"
+ ">  \ti2c@7000c000 {\n"
  "> @@ -129,7 +129,7 @@\n"
  ">  \t\tinterrupts = <0 38 0x04>;\n"
  ">  \t\t#address-cells = <1>;\n"
@@ -151,7 +157,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \ti2c at 7000c400 {\n"
+ ">  \ti2c@7000c400 {\n"
  "> @@ -138,7 +138,7 @@\n"
  ">  \t\tinterrupts = <0 84 0x04>;\n"
  ">  \t\t#address-cells = <1>;\n"
@@ -160,7 +166,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \ti2c at 7000c500 {\n"
+ ">  \ti2c@7000c500 {\n"
  "> @@ -147,7 +147,7 @@\n"
  ">  \t\tinterrupts = <0 92 0x04>;\n"
  ">  \t\t#address-cells = <1>;\n"
@@ -169,7 +175,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \ti2c at 7000d000 {\n"
+ ">  \ti2c@7000d000 {\n"
  "> @@ -156,7 +156,7 @@\n"
  ">  \t\tinterrupts = <0 53 0x04>;\n"
  ">  \t\t#address-cells = <1>;\n"
@@ -187,7 +193,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tusb at c5004000 {\n"
+ ">  \tusb@c5004000 {\n"
  "> @@ -198,7 +198,7 @@\n"
  ">  \t\treg = <0xc5004000 0x4000>;\n"
  ">  \t\tinterrupts = <0 21 0x04>;\n"
@@ -196,7 +202,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tusb at c5008000 {\n"
+ ">  \tusb@c5008000 {\n"
  "> @@ -206,35 +206,35 @@\n"
  ">  \t\treg = <0xc5008000 0x4000>;\n"
  ">  \t\tinterrupts = <0 97 0x04>;\n"
@@ -205,7 +211,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tsdhci at c8000000 {\n"
+ ">  \tsdhci@c8000000 {\n"
  ">  \t\tcompatible = \"nvidia,tegra20-sdhci\";\n"
  ">  \t\treg = <0xc8000000 0x200>;\n"
  ">  \t\tinterrupts = <0 14 0x04>;\n"
@@ -213,7 +219,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tsdhci at c8000200 {\n"
+ ">  \tsdhci@c8000200 {\n"
  ">  \t\tcompatible = \"nvidia,tegra20-sdhci\";\n"
  ">  \t\treg = <0xc8000200 0x200>;\n"
  ">  \t\tinterrupts = <0 15 0x04>;\n"
@@ -221,7 +227,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tsdhci at c8000400 {\n"
+ ">  \tsdhci@c8000400 {\n"
  ">  \t\tcompatible = \"nvidia,tegra20-sdhci\";\n"
  ">  \t\treg = <0xc8000400 0x200>;\n"
  ">  \t\tinterrupts = <0 19 0x04>;\n"
@@ -229,7 +235,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tsdhci at c8000600 {\n"
+ ">  \tsdhci@c8000600 {\n"
  ">  \t\tcompatible = \"nvidia,tegra20-sdhci\";\n"
  ">  \t\treg = <0xc8000600 0x200>;\n"
  ">  \t\tinterrupts = <0 31 0x04>;\n"
@@ -248,7 +254,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tserial at 70006040 {\n"
+ ">  \tserial@70006040 {\n"
  "> @@ -90,7 +90,7 @@\n"
  ">  \t\treg = <0x70006040 0x40>;\n"
  ">  \t\treg-shift = <2>;\n"
@@ -257,7 +263,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tserial at 70006200 {\n"
+ ">  \tserial@70006200 {\n"
  "> @@ -98,7 +98,7 @@\n"
  ">  \t\treg = <0x70006200 0x100>;\n"
  ">  \t\treg-shift = <2>;\n"
@@ -266,7 +272,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tserial at 70006300 {\n"
+ ">  \tserial@70006300 {\n"
  "> @@ -106,7 +106,7 @@\n"
  ">  \t\treg = <0x70006300 0x100>;\n"
  ">  \t\treg-shift = <2>;\n"
@@ -275,7 +281,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tserial at 70006400 {\n"
+ ">  \tserial@70006400 {\n"
  "> @@ -114,7 +114,7 @@\n"
  ">  \t\treg = <0x70006400 0x100>;\n"
  ">  \t\treg-shift = <2>;\n"
@@ -284,7 +290,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \ti2c at 7000c000 {\n"
+ ">  \ti2c@7000c000 {\n"
  "> @@ -123,7 +123,7 @@\n"
  ">  \t\tinterrupts = <0 38 0x04>;\n"
  ">  \t\t#address-cells = <1>;\n"
@@ -293,7 +299,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \ti2c at 7000c400 {\n"
+ ">  \ti2c@7000c400 {\n"
  "> @@ -132,7 +132,7 @@\n"
  ">  \t\tinterrupts = <0 84 0x04>;\n"
  ">  \t\t#address-cells = <1>;\n"
@@ -302,7 +308,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \ti2c at 7000c500 {\n"
+ ">  \ti2c@7000c500 {\n"
  "> @@ -141,7 +141,7 @@\n"
  ">  \t\tinterrupts = <0 92 0x04>;\n"
  ">  \t\t#address-cells = <1>;\n"
@@ -311,7 +317,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \ti2c at 7000c700 {\n"
+ ">  \ti2c@7000c700 {\n"
  "> @@ -150,7 +150,7 @@\n"
  ">  \t\tinterrupts = <0 120 0x04>;\n"
  ">  \t\t#address-cells = <1>;\n"
@@ -320,7 +326,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \ti2c at 7000d000 {\n"
+ ">  \ti2c@7000d000 {\n"
  "> @@ -159,7 +159,7 @@\n"
  ">  \t\tinterrupts = <0 53 0x04>;\n"
  ">  \t\t#address-cells = <1>;\n"
@@ -338,7 +344,7 @@
  "> +\t\t\tstatus = \"disabled\";\n"
  ">  \t\t};\n"
  ">  \n"
- ">  \t\ttegra_i2s1: i2s at 70080400 {\n"
+ ">  \t\ttegra_i2s1: i2s@70080400 {\n"
  ">  \t\t\tcompatible = \"nvidia,tegra30-i2s\";\n"
  ">  \t\t\treg = <0x70080400 0x100>;\n"
  ">  \t\t\tnvidia,ahub-cif-ids = <5 5>;\n"
@@ -346,7 +352,7 @@
  "> +\t\t\tstatus = \"disabled\";\n"
  ">  \t\t};\n"
  ">  \n"
- ">  \t\ttegra_i2s2: i2s at 70080500 {\n"
+ ">  \t\ttegra_i2s2: i2s@70080500 {\n"
  ">  \t\t\tcompatible = \"nvidia,tegra30-i2s\";\n"
  ">  \t\t\treg = <0x70080500 0x100>;\n"
  ">  \t\t\tnvidia,ahub-cif-ids = <6 6>;\n"
@@ -354,7 +360,7 @@
  "> +\t\t\tstatus = \"disabled\";\n"
  ">  \t\t};\n"
  ">  \n"
- ">  \t\ttegra_i2s3: i2s at 70080600 {\n"
+ ">  \t\ttegra_i2s3: i2s@70080600 {\n"
  ">  \t\t\tcompatible = \"nvidia,tegra30-i2s\";\n"
  ">  \t\t\treg = <0x70080600 0x100>;\n"
  ">  \t\t\tnvidia,ahub-cif-ids = <7 7>;\n"
@@ -362,7 +368,7 @@
  "> +\t\t\tstatus = \"disabled\";\n"
  ">  \t\t};\n"
  ">  \n"
- ">  \t\ttegra_i2s4: i2s at 70080700 {\n"
+ ">  \t\ttegra_i2s4: i2s@70080700 {\n"
  ">  \t\t\tcompatible = \"nvidia,tegra30-i2s\";\n"
  ">  \t\t\treg = <0x70080700 0x100>;\n"
  ">  \t\t\tnvidia,ahub-cif-ids = <8 8>;\n"
@@ -379,7 +385,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tsdhci at 78000200 {\n"
+ ">  \tsdhci@78000200 {\n"
  ">  \t\tcompatible = \"nvidia,tegra30-sdhci\", \"nvidia,tegra20-sdhci\";\n"
  ">  \t\treg = <0x78000200 0x200>;\n"
  ">  \t\tinterrupts = <0 15 0x04>;\n"
@@ -387,7 +393,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tsdhci at 78000400 {\n"
+ ">  \tsdhci@78000400 {\n"
  ">  \t\tcompatible = \"nvidia,tegra30-sdhci\", \"nvidia,tegra20-sdhci\";\n"
  ">  \t\treg = <0x78000400 0x200>;\n"
  ">  \t\tinterrupts = <0 19 0x04>;\n"
@@ -395,7 +401,7 @@
  "> +\t\tstatus = \"disabled\";\n"
  ">  \t};\n"
  ">  \n"
- ">  \tsdhci at 78000600 {\n"
+ ">  \tsdhci@78000600 {\n"
  ">  \t\tcompatible = \"nvidia,tegra30-sdhci\", \"nvidia,tegra20-sdhci\";\n"
  ">  \t\treg = <0x78000600 0x200>;\n"
  ">  \t\tinterrupts = <0 31 0x04>;\n"
@@ -407,7 +413,7 @@
  "> \n"
  "> _______________________________________________\n"
  "> linux-arm-kernel mailing list\n"
- "> linux-arm-kernel at lists.infradead.org\n"
+ "> linux-arm-kernel@lists.infradead.org\n"
  > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
-707084ba0ad11473e157193cd294c6ebd7ac355a4d88a9ebc5e263d20689eb1d
+20c64f2828125909119bf7ba92cfc1b488e56118bbd59f61f7662dd013ca4894
