diff for duplicates of <20151021085940.20687.94974@quantum>

diff --git a/a/1.txt b/N1/1.txt
index 4331a02..b48c1a7 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,15 +1,13 @@
 Quoting Sylwester Nawrocki (2015-10-20 04:17:35)
 > On 20/10/15 12:34, Michael Turquette wrote:
-> >> diff --git a/include/dt-bindings/clock/exynos5433.h b/include/dt-bindi=
-ngs/clock/exynos5433.h
+> >> diff --git a/include/dt-bindings/clock/exynos5433.h b/include/dt-bindings/clock/exynos5433.h
 > >> > index 5bd80d5..4f0d566 100644
 > >> > --- a/include/dt-bindings/clock/exynos5433.h
 > >> > +++ b/include/dt-bindings/clock/exynos5433.h
 > >> > @@ -765,7 +765,10 @@
 > >> >  #define CLK_SCLK_RGB_VCLK                              109
 > >> >  #define CLK_SCLK_RGB_TV_VCLK                           110
-> >> >  =
-
+> >> >  
 > >> > -#define DISP_NR_CLK                                    111
 > >> > +#define CLK_PHYCLK_HDMIPHY_PIXEL_CLKO_PHY              111
 > >> > +#define CLK_PHYCLK_HDMIPHY_TMDS_CLKO_PHY               112
@@ -17,16 +15,14 @@ ngs/clock/exynos5433.h
 > >> > +#define DISP_NR_CLK                                    113
 > >
 > > Why break compatibility with older DTBs?
-> =
-
+> 
 > I used to be resistant to changing those _NR_CLK defines
 > in the past but then realized they are not part of the DT ABI.
 > These defines are used only in drivers and affect only size
 > of the provider's allocated clock array. The confusion may be
 > caused by the fact that the whole header is shared by the kernel
 > source and dts.
-> =
-
+> 
 > $ git grep -l _NR_CLK arch/arm/boot/dts drivers/clk/samsung/
 > drivers/clk/samsung/clk-exynos-clkout.c
 > drivers/clk/samsung/clk-exynos3250.c
@@ -39,8 +35,7 @@ ngs/clock/exynos5433.h
 > drivers/clk/samsung/clk-exynos5433.c
 > drivers/clk/samsung/clk-exynos5440.c
 > drivers/clk/samsung/clk-exynos7.c
-> =
-
+> 
 > There is no *_NR_CLK in any dts file.
 > New kernel will work will older DTB, the driver will just
 > register more clocks, which will not be dereferenced anywhere
@@ -54,13 +49,15 @@ Pardon the noise. Nothing to see here, move along...
 Regards,
 Mike
 
-> =
-
-> -- =
-
+> 
+> -- 
 > Regards,
 > Sylwester
 > --
 > To unsubscribe from this list: send the line "unsubscribe linux-clk" in
 > the body of a message to majordomo@vger.kernel.org
 > More majordomo info at  http://vger.kernel.org/majordomo-info.html
+_______________________________________________
+dri-devel mailing list
+dri-devel@lists.freedesktop.org
+http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/a/content_digest b/N1/content_digest
index b6cee34..ab581f7 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,34 +5,29 @@
  "From\0Michael Turquette <mturquette@baylibre.com>\0"
  "Subject\0Re: [PATCH 01/10] clk/samsung: exynos5433: add definitions of HDMI-PHY output clocks\0"
  "Date\0Wed, 21 Oct 2015 01:59:40 -0700\0"
- "To\0Sylwester Nawrocki <s.nawrocki@samsung.com>"
- "\0"
- "Cc\0Andrzej Hajda <a.hajda@samsung.com>"
-  Inki Dae <inki.dae@samsung.com>
+ "To\0Sylwester Nawrocki <s.nawrocki@samsung.com>\0"
+ "Cc\0devicetree@vger.kernel.org"
+  Krzysztof Kozlowski <k.kozlowski@samsung.com>
+  linux-samsung-soc@vger.kernel.org
   Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
-  Marek Szyprowski <m.szyprowski@samsung.com>
-  Kyungmin Park <kyungmin.park@samsung.com>
   dri-devel@lists.freedesktop.org
-  linux-clk@vger.kernel.org
-  linux-samsung-soc@vger.kernel.org
-  devicetree@vger.kernel.org
+  Andrzej Hajda <a.hajda@samsung.com>
+  Kyungmin Park <kyungmin.park@samsung.com>
   Kukjin Kim <kgene@kernel.org>
-  Krzysztof Kozlowski <k.kozlowski@samsung.com>
- " Hyungwon Hwang <human.hwang@samsung.com>\0"
+  linux-clk@vger.kernel.org
+ " Marek Szyprowski <m.szyprowski@samsung.com>\0"
  "\00:1\0"
  "b\0"
  "Quoting Sylwester Nawrocki (2015-10-20 04:17:35)\n"
  "> On 20/10/15 12:34, Michael Turquette wrote:\n"
- "> >> diff --git a/include/dt-bindings/clock/exynos5433.h b/include/dt-bindi=\n"
- "ngs/clock/exynos5433.h\n"
+ "> >> diff --git a/include/dt-bindings/clock/exynos5433.h b/include/dt-bindings/clock/exynos5433.h\n"
  "> >> > index 5bd80d5..4f0d566 100644\n"
  "> >> > --- a/include/dt-bindings/clock/exynos5433.h\n"
  "> >> > +++ b/include/dt-bindings/clock/exynos5433.h\n"
  "> >> > @@ -765,7 +765,10 @@\n"
  "> >> >  #define CLK_SCLK_RGB_VCLK                              109\n"
  "> >> >  #define CLK_SCLK_RGB_TV_VCLK                           110\n"
- "> >> >  =\n"
- "\n"
+ "> >> >  \n"
  "> >> > -#define DISP_NR_CLK                                    111\n"
  "> >> > +#define CLK_PHYCLK_HDMIPHY_PIXEL_CLKO_PHY              111\n"
  "> >> > +#define CLK_PHYCLK_HDMIPHY_TMDS_CLKO_PHY               112\n"
@@ -40,16 +35,14 @@
  "> >> > +#define DISP_NR_CLK                                    113\n"
  "> >\n"
  "> > Why break compatibility with older DTBs?\n"
- "> =\n"
- "\n"
+ "> \n"
  "> I used to be resistant to changing those _NR_CLK defines\n"
  "> in the past but then realized they are not part of the DT ABI.\n"
  "> These defines are used only in drivers and affect only size\n"
  "> of the provider's allocated clock array. The confusion may be\n"
  "> caused by the fact that the whole header is shared by the kernel\n"
  "> source and dts.\n"
- "> =\n"
- "\n"
+ "> \n"
  "> $ git grep -l _NR_CLK arch/arm/boot/dts drivers/clk/samsung/\n"
  "> drivers/clk/samsung/clk-exynos-clkout.c\n"
  "> drivers/clk/samsung/clk-exynos3250.c\n"
@@ -62,8 +55,7 @@
  "> drivers/clk/samsung/clk-exynos5433.c\n"
  "> drivers/clk/samsung/clk-exynos5440.c\n"
  "> drivers/clk/samsung/clk-exynos7.c\n"
- "> =\n"
- "\n"
+ "> \n"
  "> There is no *_NR_CLK in any dts file.\n"
  "> New kernel will work will older DTB, the driver will just\n"
  "> register more clocks, which will not be dereferenced anywhere\n"
@@ -77,15 +69,17 @@
  "Regards,\n"
  "Mike\n"
  "\n"
- "> =\n"
- "\n"
- "> -- =\n"
- "\n"
+ "> \n"
+ "> -- \n"
  "> Regards,\n"
  "> Sylwester\n"
  "> --\n"
  "> To unsubscribe from this list: send the line \"unsubscribe linux-clk\" in\n"
  "> the body of a message to majordomo@vger.kernel.org\n"
- > More majordomo info at  http://vger.kernel.org/majordomo-info.html
+ "> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n"
+ "_______________________________________________\n"
+ "dri-devel mailing list\n"
+ "dri-devel@lists.freedesktop.org\n"
+ http://lists.freedesktop.org/mailman/listinfo/dri-devel
 
-2cce45323c0515d483d6c3ea8e719a7bc269498c1fb0f15ac20f5e8dd461bb8b
+cbff05e476855881e95bc9df9f2221680cd8dfa6510d70f38cb618dd11bcb582
