diff for duplicates of <20111125161808.GE2098@localhost.localdomain>

diff --git a/a/1.txt b/N1/1.txt
index 8c365b3..06adb01 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -2,7 +2,7 @@ On Wed, Nov 23, 2011 at 03:01:46PM +0000, Pawel Moll wrote:
 > This patch provides hooks for DT-based tile machine implementations
 > and adds Device Tree description for the motherboard.
 > 
-> Signed-off-by: Pawel Moll <pawel.moll@arm.com>
+> Signed-off-by: Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org>
 > ---
 >  Documentation/devicetree/bindings/arm/vexpress    |  101 +++++++++++
 >  arch/arm/boot/dts/vexpress-v2m.dtsi               |  191 +++++++++++++++++++++
@@ -170,7 +170,7 @@ The I2C and timer names are probably sufficiently obvious, though.
 > +		timer = &mb_timer01;
 > +	};
 > +
-> +	gic: interrupt-controller at 2c001000 {
+> +	gic: interrupt-controller@2c001000 {
 > +		compatible = "arm,cortex-a9-gic";
 > +	};
 > +
@@ -216,20 +216,20 @@ The I2C and timer names are probably sufficiently obvious, though.
 > +		#size-cells = <1>;
 > +		#interrupt-cells = <1>;
 > +
-> +		flash at 0,00000000 {
+> +		flash@0,00000000 {
 > +			compatible = "arm,vexpress-flash", "cfi-flash";
 > +			reg = <0 0x00000000 0x04000000>,
 > +			      <1 0x00000000 0x04000000>;
 > +			bank-width = <4>;
 > +		};
 > +
-> +		psram at 2,00000000 {
+> +		psram@2,00000000 {
 > +			compatible = "mtd-ram";
 > +			reg = <2 0x00000000 0x02000000>;
 > +			bank-width = <4>;
 > +		};
 > +
-> +		ethernet at 3,02000000 {
+> +		ethernet@3,02000000 {
 > +			compatible = "smsc,lan9118", "smsc,lan9115";
 > +			reg = <3 0x02000000 0x10000>;
 > +			interrupts = <15>;
@@ -239,141 +239,141 @@ The I2C and timer names are probably sufficiently obvious, though.
 > +			smsc,irq-push-pull;
 > +		};
 > +
-> +		usb at 3,03000000 {
+> +		usb@3,03000000 {
 > +			compatible = "nxp,usb-isp1761";
 > +			reg = <3 0x03000000 0x20000>;
 > +			interrupts = <16>;
 > +			port1-otg;
 > +		};
 > +
-> +		iofpga at 7,00000000 {
+> +		iofpga@7,00000000 {
 > +			compatible = "arm,amba-bus", "simple-bus";
 > +			#address-cells = <1>;
 > +			#size-cells = <1>;
 > +			ranges = <0 7 0 0x20000>;
 > +
-> +			sysreg at 00000 {
+> +			sysreg@00000 {
 > +				compatible = "arm,vexpress-sysreg";
 > +				reg = <0x00000 0x1000>;
 > +			};
 > +
-> +			sysctl at 01000 {
+> +			sysctl@01000 {
 > +				compatible = "arm,sp810", "arm,primecell";
 > +				reg = <0x01000 0x1000>;
 > +			};
 > +
 > +			/* PCI-E I2C bus */
-> +			mb_i2c_pcie: i2c at 02000 {
+> +			mb_i2c_pcie: i2c@02000 {
 > +				compatible = "arm,versatile-i2c";
 > +				reg = <0x02000 0x1000>;
 > +
 > +				#address-cells = <1>;
 > +				#size-cells = <0>;
 > +
-> +				pcie-switch at 60 {
+> +				pcie-switch@60 {
 > +					compatible = "idt,89hpes32h8";
 > +					reg = <0x60>;
 > +				};
 > +			};
 > +
-> +			aaci at 04000 {
+> +			aaci@04000 {
 > +				compatible = "arm,pl041", "arm,primecell";
 > +				reg = <0x04000 0x1000>;
 > +				interrupts = <11>;
 > +			};
 > +
-> +			mmci at 05000 {
+> +			mmci@05000 {
 > +				compatible = "arm,pl180", "arm,primecell";
 > +				reg = <0x05000 0x1000>;
 > +				interrupts = <9 10>;
 > +			};
 > +
-> +			kmi at 06000 {
+> +			kmi@06000 {
 > +				compatible = "arm,pl050", "arm,primecell";
 > +				reg = <0x06000 0x1000>;
 > +				interrupts = <12>;
 > +			};
 > +
-> +			kmi at 07000 {
+> +			kmi@07000 {
 > +				compatible = "arm,pl050", "arm,primecell";
 > +				reg = <0x07000 0x1000>;
 > +				interrupts = <13>;
 > +			};
 > +
-> +			mb_serial0: uart at 09000 {
+> +			mb_serial0: uart@09000 {
 > +				compatible = "arm,pl011", "arm,primecell";
 > +				reg = <0x09000 0x1000>;
 > +				interrupts = <5>;
 > +			};
 > +
-> +			mb_serial1: uart at 0a000 {
+> +			mb_serial1: uart@0a000 {
 > +				compatible = "arm,pl011", "arm,primecell";
 > +				reg = <0x0a000 0x1000>;
 > +				interrupts = <6>;
 > +			};
 > +
-> +			mb_serial2: uart at 0b000 {
+> +			mb_serial2: uart@0b000 {
 > +				compatible = "arm,pl011", "arm,primecell";
 > +				reg = <0x0b000 0x1000>;
 > +				interrupts = <7>;
 > +			};
 > +
-> +			mb_serial3: uart at 0c000 {
+> +			mb_serial3: uart@0c000 {
 > +				compatible = "arm,pl011", "arm,primecell";
 > +				reg = <0x0c000 0x1000>;
 > +				interrupts = <8>;
 > +			};
 > +
-> +			wdt at 0f000 {
+> +			wdt@0f000 {
 > +				compatible = "arm,sp805", "arm,primecell";
 > +				reg = <0x0f000 0x1000>;
 > +				interrupts = <0>;
 > +			};
 > +
-> +			mb_timer01: timer at 11000 {
+> +			mb_timer01: timer@11000 {
 > +				compatible = "arm,sp804", "arm,primecell";
 > +				reg = <0x11000 0x1000>;
 > +				interrupts = <2>;
 > +			};
 > +
-> +			mb_timer23: timer at 12000 {
+> +			mb_timer23: timer@12000 {
 > +				compatible = "arm,sp804", "arm,primecell";
 > +				reg = <0x12000 0x1000>;
 > +			};
 > +
 > +			/* DVI I2C bus */
-> +			mb_i2c_dvi: i2c at 16000 {
+> +			mb_i2c_dvi: i2c@16000 {
 > +				compatible = "arm,versatile-i2c";
 > +				reg = <0x16000 0x1000>;
 > +
 > +				#address-cells = <1>;
 > +				#size-cells = <0>;
 > +
-> +				dvi-transmitter at 39 {
+> +				dvi-transmitter@39 {
 > +					compatible = "sil,sii9022-tpi", "sil,sii9022";
 > +					reg = <0x39>;
 > +				};
 > +
-> +				dvi-transmitter at 60 {
+> +				dvi-transmitter@60 {
 > +					compatible = "sil,sii9022-cpi", "sil,sii9022";
 > +					reg = <0x60>;
 > +				};
 > +			};
 > +
-> +			rtc at 17000 {
+> +			rtc@17000 {
 > +				compatible = "arm,pl031", "arm,primecell";
 > +				reg = <0x17000 0x1000>;
 > +				interrupts = <4>;
 > +			};
 > +
-> +			compact-flash at 1a000 {
+> +			compact-flash@1a000 {
 > +				compatible = "ata-generic";
 > +				reg = <0x1a000 0x100
 > +				       0x1a100 0xf00>;
 > +				reg-shift = <2>;
 > +			};
 > +
-> +			clcd at 1f000 {
+> +			clcd@1f000 {
 > +				compatible = "arm,pl111", "arm,primecell";
 > +				reg = <0x1f000 0x1000>;
 > +				interrupts = <14>;
@@ -670,5 +670,5 @@ Not essential, though ... most people do know how to use grep.
 > 
 > _______________________________________________
 > 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
diff --git a/a/content_digest b/N1/content_digest
index 9e9c528..8c303b5 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,16 +1,19 @@
  "ref\01322060508-11298-1-git-send-email-pawel.moll@arm.com\0"
  "ref\01322060508-11298-3-git-send-email-pawel.moll@arm.com\0"
- "From\0dave.martin@linaro.org (Dave Martin)\0"
- "Subject\0[PATCH v2 2/4] ARM: vexpress: Add DT support in v2m\0"
+ "ref\01322060508-11298-3-git-send-email-pawel.moll-5wv7dgnIgG8@public.gmane.org\0"
+ "From\0Dave Martin <dave.martin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0"
+ "Subject\0Re: [PATCH v2 2/4] ARM: vexpress: Add DT support in v2m\0"
  "Date\0Fri, 25 Nov 2011 16:18:08 +0000\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
+ "To\0Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org>\0"
+ "Cc\0devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org"
+ " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0"
  "\00:1\0"
  "b\0"
  "On Wed, Nov 23, 2011 at 03:01:46PM +0000, Pawel Moll wrote:\n"
  "> This patch provides hooks for DT-based tile machine implementations\n"
  "> and adds Device Tree description for the motherboard.\n"
  "> \n"
- "> Signed-off-by: Pawel Moll <pawel.moll@arm.com>\n"
+ "> Signed-off-by: Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org>\n"
  "> ---\n"
  ">  Documentation/devicetree/bindings/arm/vexpress    |  101 +++++++++++\n"
  ">  arch/arm/boot/dts/vexpress-v2m.dtsi               |  191 +++++++++++++++++++++\n"
@@ -178,7 +181,7 @@
  "> +\t\ttimer = &mb_timer01;\n"
  "> +\t};\n"
  "> +\n"
- "> +\tgic: interrupt-controller at 2c001000 {\n"
+ "> +\tgic: interrupt-controller@2c001000 {\n"
  "> +\t\tcompatible = \"arm,cortex-a9-gic\";\n"
  "> +\t};\n"
  "> +\n"
@@ -224,20 +227,20 @@
  "> +\t\t#size-cells = <1>;\n"
  "> +\t\t#interrupt-cells = <1>;\n"
  "> +\n"
- "> +\t\tflash at 0,00000000 {\n"
+ "> +\t\tflash@0,00000000 {\n"
  "> +\t\t\tcompatible = \"arm,vexpress-flash\", \"cfi-flash\";\n"
  "> +\t\t\treg = <0 0x00000000 0x04000000>,\n"
  "> +\t\t\t      <1 0x00000000 0x04000000>;\n"
  "> +\t\t\tbank-width = <4>;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tpsram at 2,00000000 {\n"
+ "> +\t\tpsram@2,00000000 {\n"
  "> +\t\t\tcompatible = \"mtd-ram\";\n"
  "> +\t\t\treg = <2 0x00000000 0x02000000>;\n"
  "> +\t\t\tbank-width = <4>;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tethernet at 3,02000000 {\n"
+ "> +\t\tethernet@3,02000000 {\n"
  "> +\t\t\tcompatible = \"smsc,lan9118\", \"smsc,lan9115\";\n"
  "> +\t\t\treg = <3 0x02000000 0x10000>;\n"
  "> +\t\t\tinterrupts = <15>;\n"
@@ -247,141 +250,141 @@
  "> +\t\t\tsmsc,irq-push-pull;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tusb at 3,03000000 {\n"
+ "> +\t\tusb@3,03000000 {\n"
  "> +\t\t\tcompatible = \"nxp,usb-isp1761\";\n"
  "> +\t\t\treg = <3 0x03000000 0x20000>;\n"
  "> +\t\t\tinterrupts = <16>;\n"
  "> +\t\t\tport1-otg;\n"
  "> +\t\t};\n"
  "> +\n"
- "> +\t\tiofpga at 7,00000000 {\n"
+ "> +\t\tiofpga@7,00000000 {\n"
  "> +\t\t\tcompatible = \"arm,amba-bus\", \"simple-bus\";\n"
  "> +\t\t\t#address-cells = <1>;\n"
  "> +\t\t\t#size-cells = <1>;\n"
  "> +\t\t\tranges = <0 7 0 0x20000>;\n"
  "> +\n"
- "> +\t\t\tsysreg at 00000 {\n"
+ "> +\t\t\tsysreg@00000 {\n"
  "> +\t\t\t\tcompatible = \"arm,vexpress-sysreg\";\n"
  "> +\t\t\t\treg = <0x00000 0x1000>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tsysctl at 01000 {\n"
+ "> +\t\t\tsysctl@01000 {\n"
  "> +\t\t\t\tcompatible = \"arm,sp810\", \"arm,primecell\";\n"
  "> +\t\t\t\treg = <0x01000 0x1000>;\n"
  "> +\t\t\t};\n"
  "> +\n"
  "> +\t\t\t/* PCI-E I2C bus */\n"
- "> +\t\t\tmb_i2c_pcie: i2c at 02000 {\n"
+ "> +\t\t\tmb_i2c_pcie: i2c@02000 {\n"
  "> +\t\t\t\tcompatible = \"arm,versatile-i2c\";\n"
  "> +\t\t\t\treg = <0x02000 0x1000>;\n"
  "> +\n"
  "> +\t\t\t\t#address-cells = <1>;\n"
  "> +\t\t\t\t#size-cells = <0>;\n"
  "> +\n"
- "> +\t\t\t\tpcie-switch at 60 {\n"
+ "> +\t\t\t\tpcie-switch@60 {\n"
  "> +\t\t\t\t\tcompatible = \"idt,89hpes32h8\";\n"
  "> +\t\t\t\t\treg = <0x60>;\n"
  "> +\t\t\t\t};\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\taaci at 04000 {\n"
+ "> +\t\t\taaci@04000 {\n"
  "> +\t\t\t\tcompatible = \"arm,pl041\", \"arm,primecell\";\n"
  "> +\t\t\t\treg = <0x04000 0x1000>;\n"
  "> +\t\t\t\tinterrupts = <11>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tmmci at 05000 {\n"
+ "> +\t\t\tmmci@05000 {\n"
  "> +\t\t\t\tcompatible = \"arm,pl180\", \"arm,primecell\";\n"
  "> +\t\t\t\treg = <0x05000 0x1000>;\n"
  "> +\t\t\t\tinterrupts = <9 10>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tkmi at 06000 {\n"
+ "> +\t\t\tkmi@06000 {\n"
  "> +\t\t\t\tcompatible = \"arm,pl050\", \"arm,primecell\";\n"
  "> +\t\t\t\treg = <0x06000 0x1000>;\n"
  "> +\t\t\t\tinterrupts = <12>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tkmi at 07000 {\n"
+ "> +\t\t\tkmi@07000 {\n"
  "> +\t\t\t\tcompatible = \"arm,pl050\", \"arm,primecell\";\n"
  "> +\t\t\t\treg = <0x07000 0x1000>;\n"
  "> +\t\t\t\tinterrupts = <13>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tmb_serial0: uart at 09000 {\n"
+ "> +\t\t\tmb_serial0: uart@09000 {\n"
  "> +\t\t\t\tcompatible = \"arm,pl011\", \"arm,primecell\";\n"
  "> +\t\t\t\treg = <0x09000 0x1000>;\n"
  "> +\t\t\t\tinterrupts = <5>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tmb_serial1: uart at 0a000 {\n"
+ "> +\t\t\tmb_serial1: uart@0a000 {\n"
  "> +\t\t\t\tcompatible = \"arm,pl011\", \"arm,primecell\";\n"
  "> +\t\t\t\treg = <0x0a000 0x1000>;\n"
  "> +\t\t\t\tinterrupts = <6>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tmb_serial2: uart at 0b000 {\n"
+ "> +\t\t\tmb_serial2: uart@0b000 {\n"
  "> +\t\t\t\tcompatible = \"arm,pl011\", \"arm,primecell\";\n"
  "> +\t\t\t\treg = <0x0b000 0x1000>;\n"
  "> +\t\t\t\tinterrupts = <7>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tmb_serial3: uart at 0c000 {\n"
+ "> +\t\t\tmb_serial3: uart@0c000 {\n"
  "> +\t\t\t\tcompatible = \"arm,pl011\", \"arm,primecell\";\n"
  "> +\t\t\t\treg = <0x0c000 0x1000>;\n"
  "> +\t\t\t\tinterrupts = <8>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\twdt at 0f000 {\n"
+ "> +\t\t\twdt@0f000 {\n"
  "> +\t\t\t\tcompatible = \"arm,sp805\", \"arm,primecell\";\n"
  "> +\t\t\t\treg = <0x0f000 0x1000>;\n"
  "> +\t\t\t\tinterrupts = <0>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tmb_timer01: timer at 11000 {\n"
+ "> +\t\t\tmb_timer01: timer@11000 {\n"
  "> +\t\t\t\tcompatible = \"arm,sp804\", \"arm,primecell\";\n"
  "> +\t\t\t\treg = <0x11000 0x1000>;\n"
  "> +\t\t\t\tinterrupts = <2>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tmb_timer23: timer at 12000 {\n"
+ "> +\t\t\tmb_timer23: timer@12000 {\n"
  "> +\t\t\t\tcompatible = \"arm,sp804\", \"arm,primecell\";\n"
  "> +\t\t\t\treg = <0x12000 0x1000>;\n"
  "> +\t\t\t};\n"
  "> +\n"
  "> +\t\t\t/* DVI I2C bus */\n"
- "> +\t\t\tmb_i2c_dvi: i2c at 16000 {\n"
+ "> +\t\t\tmb_i2c_dvi: i2c@16000 {\n"
  "> +\t\t\t\tcompatible = \"arm,versatile-i2c\";\n"
  "> +\t\t\t\treg = <0x16000 0x1000>;\n"
  "> +\n"
  "> +\t\t\t\t#address-cells = <1>;\n"
  "> +\t\t\t\t#size-cells = <0>;\n"
  "> +\n"
- "> +\t\t\t\tdvi-transmitter at 39 {\n"
+ "> +\t\t\t\tdvi-transmitter@39 {\n"
  "> +\t\t\t\t\tcompatible = \"sil,sii9022-tpi\", \"sil,sii9022\";\n"
  "> +\t\t\t\t\treg = <0x39>;\n"
  "> +\t\t\t\t};\n"
  "> +\n"
- "> +\t\t\t\tdvi-transmitter at 60 {\n"
+ "> +\t\t\t\tdvi-transmitter@60 {\n"
  "> +\t\t\t\t\tcompatible = \"sil,sii9022-cpi\", \"sil,sii9022\";\n"
  "> +\t\t\t\t\treg = <0x60>;\n"
  "> +\t\t\t\t};\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\trtc at 17000 {\n"
+ "> +\t\t\trtc@17000 {\n"
  "> +\t\t\t\tcompatible = \"arm,pl031\", \"arm,primecell\";\n"
  "> +\t\t\t\treg = <0x17000 0x1000>;\n"
  "> +\t\t\t\tinterrupts = <4>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tcompact-flash at 1a000 {\n"
+ "> +\t\t\tcompact-flash@1a000 {\n"
  "> +\t\t\t\tcompatible = \"ata-generic\";\n"
  "> +\t\t\t\treg = <0x1a000 0x100\n"
  "> +\t\t\t\t       0x1a100 0xf00>;\n"
  "> +\t\t\t\treg-shift = <2>;\n"
  "> +\t\t\t};\n"
  "> +\n"
- "> +\t\t\tclcd at 1f000 {\n"
+ "> +\t\t\tclcd@1f000 {\n"
  "> +\t\t\t\tcompatible = \"arm,pl111\", \"arm,primecell\";\n"
  "> +\t\t\t\treg = <0x1f000 0x1000>;\n"
  "> +\t\t\t\tinterrupts = <14>;\n"
@@ -678,7 +681,7 @@
  "> \n"
  "> _______________________________________________\n"
  "> linux-arm-kernel mailing list\n"
- "> linux-arm-kernel at lists.infradead.org\n"
+ "> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\n"
  > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
-467a9dd1b0d690df65ed8040bf11614805c21ae0a73427fda0290a6650765c09
+19634374975648f0dce6c85699b11bdd708c6f7e72784dad2ec90c0023773a81
