diff for duplicates of <551BB89A.60405@free-electrons.com>

diff --git a/a/1.txt b/N1/1.txt
index d44d89a..b3ff2cc 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -4,7 +4,7 @@ On 01/04/2015 11:02, Marcin Wojtas wrote:
 > Hi Gregory,
 > 
 > When I run standby on A385 I get following error:
-> root at localhost:~# echo standby > /sys/power/state
+> root@localhost:~# echo standby > /sys/power/state
 > [  122.889266] PM: System core suspend callback
 > mvebu_mbus_suspend+0x0/0xf4 failed.
 > 
@@ -78,7 +78,7 @@ Gregory
 >>
 >> _______________________________________________
 >> 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
 
 
@@ -87,10 +87,3 @@ Gregory Clement, Free Electrons
 Kernel, drivers, real-time and embedded Linux
 development, consulting, training and support.
 http://free-electrons.com
--------------- next part --------------
-A non-text attachment was scrubbed...
-Name: 0001-ARM-mvebu-adjust-mbus-controller-description-on-Arma.patch
-Type: text/x-diff
-Size: 1205 bytes
-Desc: not available
-URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150401/c5ed8db9/attachment.bin>
diff --git a/N1/2.hdr b/N1/2.hdr
new file mode 100644
index 0000000..c964d8f
--- /dev/null
+++ b/N1/2.hdr
@@ -0,0 +1,6 @@
+Content-Type: text/x-diff;
+ name="0001-ARM-mvebu-adjust-mbus-controller-description-on-Arma.patch"
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: attachment;
+ filename*0="0001-ARM-mvebu-adjust-mbus-controller-description-on-Arma.pa";
+ filename*1="tch"
diff --git a/N1/2.txt b/N1/2.txt
new file mode 100644
index 0000000..4e9b99a
--- /dev/null
+++ b/N1/2.txt
@@ -0,0 +1,32 @@
+From 24f3e86d1abcecec0595cdf7550f228f994f3426 Mon Sep 17 00:00:00 2001
+From: Gregory CLEMENT <gregory.clement@free-electrons.com>
+Date: Wed, 1 Apr 2015 11:16:56 +0200
+Subject: [PATCH] ARM: mvebu: adjust mbus controller description on Armada 38x
+
+AS for the Armada 370 and the Armada XP, in order to support
+suspend(or standby)/resume on Armada 38x, an additional set of
+registers need to be described at the MBus controller level. This
+commit therefore adjusts the Device Tree of the Armada 38x SoC to
+include those registers in the MBus controller description.
+
+Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
+---
+ arch/arm/boot/dts/armada-38x.dtsi | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
+index 1dff30a81e24..900f7f7f407f 100644
+--- a/arch/arm/boot/dts/armada-38x.dtsi
++++ b/arch/arm/boot/dts/armada-38x.dtsi
+@@ -365,7 +365,8 @@
+ 
+ 			mbusc: mbus-controller@20000 {
+ 				compatible = "marvell,mbus-controller";
+-				reg = <0x20000 0x100>, <0x20180 0x20>;
++				reg = <0x20000 0x100>, <0x20180 0x20>,
++				      <0x20250 0x8>;
+ 			};
+ 
+ 			mpic: interrupt-controller@20000 {
+-- 
+2.1.0
diff --git a/a/content_digest b/N1/content_digest
index 7a9f4c4..61d07fd 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,10 +1,23 @@
  "ref\01427724278-12379-1-git-send-email-gregory.clement@free-electrons.com\0"
  "ref\0CAPv3WKew5FFsA+ZphXO1hfYcy5hi_SzEBBhyk5QtQ5zn-SAenQ@mail.gmail.com\0"
- "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0"
- "Subject\0[PATCH 0/5] Add standby support for the recent mvebu SoCs\0"
+ "From\0Gregory CLEMENT <gregory.clement@free-electrons.com>\0"
+ "Subject\0Re: [PATCH 0/5] Add standby support for the recent mvebu SoCs\0"
  "Date\0Wed, 01 Apr 2015 11:21:30 +0200\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
- "\00:1\0"
+ "To\0Marcin Wojtas <mw@semihalf.com>\0"
+ "Cc\0Jason Cooper <jason@lakedaemon.net>"
+  Andrew Lunn <andrew@lunn.ch>
+  Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
+  Thomas Gleixner <tglx@linutronix.de>
+  linux-kernel@vger.kernel.org
+  Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+  Boris BREZILLON <boris.brezillon@free-electrons.com>
+  Tawfik Bayouk <tawfik@marvell.com>
+  Nadav Haklai <nadavh@marvell.com>
+  Lior Amsalem <alior@marvell.com>
+  Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+  Maxime Ripard <maxime.ripard@free-electrons.com>
+ " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0"
+ "\01:1\0"
  "b\0"
  "Hi Marcin,\n"
  "\n"
@@ -12,7 +25,7 @@
  "> Hi Gregory,\n"
  "> \n"
  "> When I run standby on A385 I get following error:\n"
- "> root at localhost:~# echo standby > /sys/power/state\n"
+ "> root@localhost:~# echo standby > /sys/power/state\n"
  "> [  122.889266] PM: System core suspend callback\n"
  "> mvebu_mbus_suspend+0x0/0xf4 failed.\n"
  "> \n"
@@ -86,7 +99,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\n"
  "\n"
  "\n"
@@ -94,13 +107,41 @@
  "Gregory Clement, Free Electrons\n"
  "Kernel, drivers, real-time and embedded Linux\n"
  "development, consulting, training and support.\n"
- "http://free-electrons.com\n"
- "-------------- next part --------------\n"
- "A non-text attachment was scrubbed...\n"
- "Name: 0001-ARM-mvebu-adjust-mbus-controller-description-on-Arma.patch\n"
- "Type: text/x-diff\n"
- "Size: 1205 bytes\n"
- "Desc: not available\n"
- URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150401/c5ed8db9/attachment.bin>
+ http://free-electrons.com
+ "\01:2\0"
+ "fn\00001-ARM-mvebu-adjust-mbus-controller-description-on-Arma.patch\0"
+ "b\0"
+ "From 24f3e86d1abcecec0595cdf7550f228f994f3426 Mon Sep 17 00:00:00 2001\n"
+ "From: Gregory CLEMENT <gregory.clement@free-electrons.com>\n"
+ "Date: Wed, 1 Apr 2015 11:16:56 +0200\n"
+ "Subject: [PATCH] ARM: mvebu: adjust mbus controller description on Armada 38x\n"
+ "\n"
+ "AS for the Armada 370 and the Armada XP, in order to support\n"
+ "suspend(or standby)/resume on Armada 38x, an additional set of\n"
+ "registers need to be described at the MBus controller level. This\n"
+ "commit therefore adjusts the Device Tree of the Armada 38x SoC to\n"
+ "include those registers in the MBus controller description.\n"
+ "\n"
+ "Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>\n"
+ "---\n"
+ " arch/arm/boot/dts/armada-38x.dtsi | 3 ++-\n"
+ " 1 file changed, 2 insertions(+), 1 deletion(-)\n"
+ "\n"
+ "diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi\n"
+ "index 1dff30a81e24..900f7f7f407f 100644\n"
+ "--- a/arch/arm/boot/dts/armada-38x.dtsi\n"
+ "+++ b/arch/arm/boot/dts/armada-38x.dtsi\n"
+ "@@ -365,7 +365,8 @@\n"
+ " \n"
+ " \t\t\tmbusc: mbus-controller@20000 {\n"
+ " \t\t\t\tcompatible = \"marvell,mbus-controller\";\n"
+ "-\t\t\t\treg = <0x20000 0x100>, <0x20180 0x20>;\n"
+ "+\t\t\t\treg = <0x20000 0x100>, <0x20180 0x20>,\n"
+ "+\t\t\t\t      <0x20250 0x8>;\n"
+ " \t\t\t};\n"
+ " \n"
+ " \t\t\tmpic: interrupt-controller@20000 {\n"
+ "-- \n"
+ 2.1.0
 
-3055e64b72edad2854e5da9ce9aeb0941d7068429feafaefbbf5e5db72bd473c
+6090bef3b069b6369f35cf26ee23dc5fd3c3c49f98cb4ee14a923b16a79df304
