diff for duplicates of <20150618183654.25948.26168@quantum>

diff --git a/a/1.txt b/N1/1.txt
index 5ad6018..506c2d8 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,27 +1,22 @@
 Quoting Gregory CLEMENT (2015-06-17 04:57:08)
 > Hi Mike, Stephen,
-> =
-
+> 
 > On 16/06/2015 17:56, Boris Brezillon wrote:
 > > The crypto SRAM, used by the armada 370 cpuidle code to workaround a bug
 > > in the BootROM code, requires the crypto clk to be up and running.
 > > Flag the crypto clk as IGNORE_UNUSED until we add the proper
-> > infrastructure to define the crypto SRAM in the DT and reference the cr=
-ypto
+> > infrastructure to define the crypto SRAM in the DT and reference the crypto
 > > clk in this SRAM node.
-> > =
-
+> > 
 > > Reported-by: Kevin Hilman <khilman@linaro.org>
 > > Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
 > > Tested-by: Kevin Hilman <khilman@linaro.org>
 > > Fixes: 29e623475c50267ee3aaa49ebb6cbe107bce8d2a ("clk: mvebu: add
 > > missing CESA gate clk").
 > > Cc: <stable@vger.kernel.org> #4.1
-> =
-
+> 
 > Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
-> =
-
+> 
 > Would it possible to apply this fix on 4.1-rc8 ?
 
 Hi Gregory,
@@ -39,31 +34,24 @@ anywhere in my tree. I'm not sure where this sha1 hash came from.
 Regards,
 Mike
 
-> =
-
+> 
 > Thanks,
-> =
-
+> 
 > Gregory
-> =
-
+> 
 > > ---
 > > Changes since v1:
 > > - add the Reported-by tag
 > > - add the missing trailing ','
-> > =
-
+> > 
 > >  drivers/clk/mvebu/armada-370.c | 2 +-
 > >  1 file changed, 1 insertion(+), 1 deletion(-)
-> > =
-
-> > diff --git a/drivers/clk/mvebu/armada-370.c b/drivers/clk/mvebu/armada-=
-370.c
+> > 
+> > diff --git a/drivers/clk/mvebu/armada-370.c b/drivers/clk/mvebu/armada-370.c
 > > index c19fd77..2c7c108 100644
 > > --- a/drivers/clk/mvebu/armada-370.c
 > > +++ b/drivers/clk/mvebu/armada-370.c
-> > @@ -163,7 +163,7 @@ static const struct clk_gating_soc_desc a370_gating=
-_desc[] __initconst =3D {
+> > @@ -163,7 +163,7 @@ static const struct clk_gating_soc_desc a370_gating_desc[] __initconst = {
 > >       { "pex1", "pex1_en", 9, 0 },
 > >       { "sata0", NULL, 15, 0 },
 > >       { "sdio", NULL, 17, 0 },
@@ -72,21 +60,16 @@ _desc[] __initconst =3D {
 > >       { "tdm", NULL, 25, 0 },
 > >       { "ddr", NULL, 28, CLK_IGNORE_UNUSED },
 > >       { "sata1", NULL, 30, 0 },
-> > =
-
-> =
-
-> =
-
-> -- =
-
+> > 
+> 
+> 
+> -- 
 > Gregory Clement, Free Electrons
 > Kernel, drivers, real-time and embedded Linux
 > development, consulting, training and support.
 > http://free-electrons.com
-> =
-
+> 
 > _______________________________________________
 > linux-arm-kernel mailing list
-> linux-arm-kernel@lists.infradead.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 9d4f94e..49638ce 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,49 +1,30 @@
  "ref\01434470179-20835-1-git-send-email-boris.brezillon@free-electrons.com\0"
  "ref\055816094.2020208@free-electrons.com\0"
- "From\0Michael Turquette <mturquette@linaro.org>\0"
- "Subject\0Re: [PATCH v2] clk: mvebu: flag the crypto clk as CLK_IGNORE_UNUSED\0"
+ "From\0mturquette@linaro.org (Michael Turquette)\0"
+ "Subject\0[PATCH v2] clk: mvebu: flag the crypto clk as CLK_IGNORE_UNUSED\0"
  "Date\0Thu, 18 Jun 2015 11:36:54 -0700\0"
- "To\0Gregory CLEMENT <gregory.clement@free-electrons.com>"
- " Stephen Boyd <sboyd@codeaurora.org>\0"
- "Cc\0Thomas Petazzoni <thomas.petazzoni@free-electrons.com>"
-  Boris Brezillon <boris.brezillon@free-electrons.com>
-  Jason Cooper <jason@lakedaemon.net>
-  Tawfik Bayouk <tawfik@marvell.com>
-  Andrew Lunn <andrew@lunn.ch>
-  Kevin Hilman <khilman@kernel.org>
-  stable@vger.kernel.org
-  Eran Ben-Avi <benavi@marvell.com>
-  Nadav Haklai <nadavh@marvell.com>
-  Lior Amsalem <alior@marvell.com>
-  linux-clk@vger.kernel.org
-  linux-arm-kernel@lists.infradead.org
- " Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Quoting Gregory CLEMENT (2015-06-17 04:57:08)\n"
  "> Hi Mike, Stephen,\n"
- "> =\n"
- "\n"
+ "> \n"
  "> On 16/06/2015 17:56, Boris Brezillon wrote:\n"
  "> > The crypto SRAM, used by the armada 370 cpuidle code to workaround a bug\n"
  "> > in the BootROM code, requires the crypto clk to be up and running.\n"
  "> > Flag the crypto clk as IGNORE_UNUSED until we add the proper\n"
- "> > infrastructure to define the crypto SRAM in the DT and reference the cr=\n"
- "ypto\n"
+ "> > infrastructure to define the crypto SRAM in the DT and reference the crypto\n"
  "> > clk in this SRAM node.\n"
- "> > =\n"
- "\n"
+ "> > \n"
  "> > Reported-by: Kevin Hilman <khilman@linaro.org>\n"
  "> > Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>\n"
  "> > Tested-by: Kevin Hilman <khilman@linaro.org>\n"
  "> > Fixes: 29e623475c50267ee3aaa49ebb6cbe107bce8d2a (\"clk: mvebu: add\n"
  "> > missing CESA gate clk\").\n"
  "> > Cc: <stable@vger.kernel.org> #4.1\n"
- "> =\n"
- "\n"
+ "> \n"
  "> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>\n"
- "> =\n"
- "\n"
+ "> \n"
  "> Would it possible to apply this fix on 4.1-rc8 ?\n"
  "\n"
  "Hi Gregory,\n"
@@ -61,31 +42,24 @@
  "Regards,\n"
  "Mike\n"
  "\n"
- "> =\n"
- "\n"
+ "> \n"
  "> Thanks,\n"
- "> =\n"
- "\n"
+ "> \n"
  "> Gregory\n"
- "> =\n"
- "\n"
+ "> \n"
  "> > ---\n"
  "> > Changes since v1:\n"
  "> > - add the Reported-by tag\n"
  "> > - add the missing trailing ','\n"
- "> > =\n"
- "\n"
+ "> > \n"
  "> >  drivers/clk/mvebu/armada-370.c | 2 +-\n"
  "> >  1 file changed, 1 insertion(+), 1 deletion(-)\n"
- "> > =\n"
- "\n"
- "> > diff --git a/drivers/clk/mvebu/armada-370.c b/drivers/clk/mvebu/armada-=\n"
- "370.c\n"
+ "> > \n"
+ "> > diff --git a/drivers/clk/mvebu/armada-370.c b/drivers/clk/mvebu/armada-370.c\n"
  "> > index c19fd77..2c7c108 100644\n"
  "> > --- a/drivers/clk/mvebu/armada-370.c\n"
  "> > +++ b/drivers/clk/mvebu/armada-370.c\n"
- "> > @@ -163,7 +163,7 @@ static const struct clk_gating_soc_desc a370_gating=\n"
- "_desc[] __initconst =3D {\n"
+ "> > @@ -163,7 +163,7 @@ static const struct clk_gating_soc_desc a370_gating_desc[] __initconst = {\n"
  "> >       { \"pex1\", \"pex1_en\", 9, 0 },\n"
  "> >       { \"sata0\", NULL, 15, 0 },\n"
  "> >       { \"sdio\", NULL, 17, 0 },\n"
@@ -94,23 +68,18 @@
  "> >       { \"tdm\", NULL, 25, 0 },\n"
  "> >       { \"ddr\", NULL, 28, CLK_IGNORE_UNUSED },\n"
  "> >       { \"sata1\", NULL, 30, 0 },\n"
- "> > =\n"
- "\n"
- "> =\n"
- "\n"
- "> =\n"
- "\n"
- "> -- =\n"
- "\n"
+ "> > \n"
+ "> \n"
+ "> \n"
+ "> -- \n"
  "> Gregory Clement, Free Electrons\n"
  "> Kernel, drivers, real-time and embedded Linux\n"
  "> development, consulting, training and support.\n"
  "> http://free-electrons.com\n"
- "> =\n"
- "\n"
+ "> \n"
  "> _______________________________________________\n"
  "> linux-arm-kernel mailing list\n"
- "> linux-arm-kernel@lists.infradead.org\n"
+ "> linux-arm-kernel at lists.infradead.org\n"
  > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
-b13af92cc40bc85c3e1f34a634118aa9ce1277f5b8a427f7c4ad955dda67ffee
+deb5a9dc8fb869c51eae6c8fa8797895668ded08aa407b5d579b9af29c996501
