diff for duplicates of <5090FEE1.5070206@ti.com>

diff --git a/a/1.txt b/N1/1.txt
index 6b43fc7..47a0898 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -44,7 +44,7 @@ Benoit
 >> Avinash
 >>
 >>>>
->>>> Signed-off-by: Matt Porter <mporter-l0cyMroinI0@public.gmane.org>
+>>>> Signed-off-by: Matt Porter <mporter@ti.com>
 >>>> ---
 >>>>  arch/arm/boot/dts/am335x-bone.dts |   17 +++++++++++++++
 >>>>  arch/arm/boot/dts/am335x-evm.dts  |    9 ++++++++
@@ -59,7 +59,7 @@ Benoit
 >>>>  		reg = <0x80000000 0x10000000>; /* 256 MB */
 >>>>  	};
 >>>>  
->>>> +	am3358_pinmux: pinmux@44e10800 {
+>>>> +	am3358_pinmux: pinmux at 44e10800 {
 >>>> +		spi1_pins: pinmux_spi1_pins {
 >>>> +			pinctrl-single,pins = <
 >>>> +				0x190 0x13	/* mcasp0_aclkx.spi1_sclk, OUTPUT_PULLUP | MODE3 */
@@ -74,7 +74,7 @@ Benoit
 >>> Change to am33xx_pinmux.
 >>>
 >>>>  	ocp {
->>>>  		uart1: serial@44e09000 {
+>>>>  		uart1: serial at 44e09000 {
 >>>>  			status = "okay";
 >>>> @@ -84,3 +95,9 @@
 >>>>  &mmc1 {
@@ -97,7 +97,7 @@ Benoit
 >>>> +
 >>>> +&spi0 {
 >>>> +	status = "okay";
->>>> +	spi-flash@0 {
+>>>> +	spi-flash at 0 {
 >>>> +		compatible = "spansion,s25fl064k", "m25p80";
 >>>> +		spi-max-frequency = <24000000>;
 >>>> +		reg = <0>;
@@ -116,7 +116,7 @@ Benoit
 >>>>  		};
 >>>>  	};
 >>>>  
->>>> +	am3358_pinmux: pinmux@44e10800 {
+>>>> +	am3358_pinmux: pinmux at 44e10800 {
 >>>> +		compatible = "pinctrl-single";
 >>>> +		reg = <0x44e10800 0x0238>;
 >>>> +		#address-cells = <1>;
@@ -139,7 +139,7 @@ Benoit
 >>>>  			status = "disabled";
 >>>>  		};
 >>>>  
->>>> +		spi0: spi@48030000 {
+>>>> +		spi0: spi at 48030000 {
 >>>> +			compatible = "ti,omap4-mcspi";
 >>>> +			ti,hwmods = "spi0";
 >>>> +			#address-cells = <1>;
@@ -156,7 +156,7 @@ Benoit
 >>>> +			status = "disabled";
 >>>> +		};
 >>>> +
->>>> +		spi1: spi@481a0000 {
+>>>> +		spi1: spi at 481a0000 {
 >>>> +			compatible = "ti,omap4-mcspi";
 >>>> +			ti,hwmods = "spi1";
 >>>> +			#address-cells = <1>;
@@ -173,7 +173,7 @@ Benoit
 >>>> +			status = "disabled";
 >>>> +		};
 >>>> +
->>>>  		wdt2: wdt@44e35000 {
+>>>>  		wdt2: wdt at 44e35000 {
 >>>>  			compatible = "ti,omap3-wdt";
 >>>>  			ti,hwmods = "wd_timer2";
 >>>> -- 
@@ -182,7 +182,7 @@ Benoit
 >>>>
 >>>> _______________________________________________
 >>>> linux-arm-kernel mailing list
->>>> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.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 1939f3d..0bdd07e 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,30 +2,10 @@
  "ref\01350566815-409-17-git-send-email-mporter@ti.com\0"
  "ref\0518397C60809E147AF5323E0420B992E3E9D597B@DBDE01.ent.ti.com\0"
  "ref\05090FA92.1080400@ti.com\0"
- "ref\05090FA92.1080400-l0cyMroinI0@public.gmane.org\0"
- "From\0Benoit Cousson <b-cousson-l0cyMroinI0@public.gmane.org>\0"
- "Subject\0Re: [RFC PATCH v3 16/16] ARM: dts: add AM33XX SPI support\0"
+ "From\0b-cousson@ti.com (Benoit Cousson)\0"
+ "Subject\0[RFC PATCH v3 16/16] ARM: dts: add AM33XX SPI support\0"
  "Date\0Wed, 31 Oct 2012 11:35:13 +0100\0"
- "To\0Philip"
- " Avinash <avinashphilip-l0cyMroinI0@public.gmane.org>\0"
- "Cc\0Porter"
-  Matt <mporter-l0cyMroinI0@public.gmane.org>
-  Linux DaVinci Kernel List <davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/@public.gmane.org>
-  Linux OMAP List <linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
-  Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
-  Linux Documentation List <linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
-  Linux MMC List <linux-mmc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
-  Devicetree Discuss <devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org>
-  Mark Brown <broonie-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
-  Nori
-  Sekhar <nsekhar-l0cyMroinI0@public.gmane.org>
-  Linux Kernel Mailing List <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
-  Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>
-  Vinod Koul <vinod.koul-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
-  Dan Williams <djbw-b10kYP2dOMg@public.gmane.org>
-  Linux SPI Devel List <spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>
-  Chris Ball <cjb-2X9k7bc8m7Mdnm+yROfE0A@public.gmane.org>
- " Linux ARM Kernel List <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "\n"
@@ -74,7 +54,7 @@
  ">> Avinash\n"
  ">>\n"
  ">>>>\n"
- ">>>> Signed-off-by: Matt Porter <mporter-l0cyMroinI0@public.gmane.org>\n"
+ ">>>> Signed-off-by: Matt Porter <mporter@ti.com>\n"
  ">>>> ---\n"
  ">>>>  arch/arm/boot/dts/am335x-bone.dts |   17 +++++++++++++++\n"
  ">>>>  arch/arm/boot/dts/am335x-evm.dts  |    9 ++++++++\n"
@@ -89,7 +69,7 @@
  ">>>>  \t\treg = <0x80000000 0x10000000>; /* 256 MB */\n"
  ">>>>  \t};\n"
  ">>>>  \n"
- ">>>> +\tam3358_pinmux: pinmux@44e10800 {\n"
+ ">>>> +\tam3358_pinmux: pinmux at 44e10800 {\n"
  ">>>> +\t\tspi1_pins: pinmux_spi1_pins {\n"
  ">>>> +\t\t\tpinctrl-single,pins = <\n"
  ">>>> +\t\t\t\t0x190 0x13\t/* mcasp0_aclkx.spi1_sclk, OUTPUT_PULLUP | MODE3 */\n"
@@ -104,7 +84,7 @@
  ">>> Change to am33xx_pinmux.\n"
  ">>>\n"
  ">>>>  \tocp {\n"
- ">>>>  \t\tuart1: serial@44e09000 {\n"
+ ">>>>  \t\tuart1: serial at 44e09000 {\n"
  ">>>>  \t\t\tstatus = \"okay\";\n"
  ">>>> @@ -84,3 +95,9 @@\n"
  ">>>>  &mmc1 {\n"
@@ -127,7 +107,7 @@
  ">>>> +\n"
  ">>>> +&spi0 {\n"
  ">>>> +\tstatus = \"okay\";\n"
- ">>>> +\tspi-flash@0 {\n"
+ ">>>> +\tspi-flash at 0 {\n"
  ">>>> +\t\tcompatible = \"spansion,s25fl064k\", \"m25p80\";\n"
  ">>>> +\t\tspi-max-frequency = <24000000>;\n"
  ">>>> +\t\treg = <0>;\n"
@@ -146,7 +126,7 @@
  ">>>>  \t\t};\n"
  ">>>>  \t};\n"
  ">>>>  \n"
- ">>>> +\tam3358_pinmux: pinmux@44e10800 {\n"
+ ">>>> +\tam3358_pinmux: pinmux at 44e10800 {\n"
  ">>>> +\t\tcompatible = \"pinctrl-single\";\n"
  ">>>> +\t\treg = <0x44e10800 0x0238>;\n"
  ">>>> +\t\t#address-cells = <1>;\n"
@@ -169,7 +149,7 @@
  ">>>>  \t\t\tstatus = \"disabled\";\n"
  ">>>>  \t\t};\n"
  ">>>>  \n"
- ">>>> +\t\tspi0: spi@48030000 {\n"
+ ">>>> +\t\tspi0: spi at 48030000 {\n"
  ">>>> +\t\t\tcompatible = \"ti,omap4-mcspi\";\n"
  ">>>> +\t\t\tti,hwmods = \"spi0\";\n"
  ">>>> +\t\t\t#address-cells = <1>;\n"
@@ -186,7 +166,7 @@
  ">>>> +\t\t\tstatus = \"disabled\";\n"
  ">>>> +\t\t};\n"
  ">>>> +\n"
- ">>>> +\t\tspi1: spi@481a0000 {\n"
+ ">>>> +\t\tspi1: spi at 481a0000 {\n"
  ">>>> +\t\t\tcompatible = \"ti,omap4-mcspi\";\n"
  ">>>> +\t\t\tti,hwmods = \"spi1\";\n"
  ">>>> +\t\t\t#address-cells = <1>;\n"
@@ -203,7 +183,7 @@
  ">>>> +\t\t\tstatus = \"disabled\";\n"
  ">>>> +\t\t};\n"
  ">>>> +\n"
- ">>>>  \t\twdt2: wdt@44e35000 {\n"
+ ">>>>  \t\twdt2: wdt at 44e35000 {\n"
  ">>>>  \t\t\tcompatible = \"ti,omap3-wdt\";\n"
  ">>>>  \t\t\tti,hwmods = \"wd_timer2\";\n"
  ">>>> -- \n"
@@ -212,7 +192,7 @@
  ">>>>\n"
  ">>>> _______________________________________________\n"
  ">>>> linux-arm-kernel mailing list\n"
- ">>>> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\n"
+ ">>>> linux-arm-kernel at lists.infradead.org\n"
  ">>>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\n"
  ">>>>\n"
  ">>>\n"
@@ -220,4 +200,4 @@
  ">>\n"
  >
 
-033ca59b348cbe448e499532954755c83294a1cfa9f6f5c8c5532373083e40de
+2046e150a3865b39e0f6b84bbfac437de9db6c9f9f8d0b3cb24b3edf12d2c17b
