diff for duplicates of <20091207144145.GT4808@trinity.fluff.org>

diff --git a/a/1.txt b/N1/1.txt
index 7fd013f..cc25385 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -6,9 +6,9 @@ On Fri, Dec 04, 2009 at 08:06:12PM +0900, jassi brar wrote:
 > >>
 > >> Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
 > >> ---
-> >>  arch/arm/plat-s3c64xx/include/plat/spi.h |   68 ++++++++++++++++++++++++++++++
-> >>  1 files changed, 68 insertions(+), 0 deletions(-)
-> >>  create mode 100644 arch/arm/plat-s3c64xx/include/plat/spi.h
+> >> ?arch/arm/plat-s3c64xx/include/plat/spi.h | ? 68 ++++++++++++++++++++++++++++++
+> >> ?1 files changed, 68 insertions(+), 0 deletions(-)
+> >> ?create mode 100644 arch/arm/plat-s3c64xx/include/plat/spi.h
 > >>
 > >> diff --git a/arch/arm/plat-s3c64xx/include/plat/spi.h b/arch/arm/plat-s3c64xx/include/plat/spi.h
 > >> new file mode 100644
@@ -33,7 +33,7 @@ right header without having to work out what is being included.
 > >> +/* linux/arch/arm/plat-s3c64xx/include/plat/spi.h
 > >> + *
 > >> + * Copyright (C) 2009 Samsung Electronics Ltd.
-> >> + *   Jaswinder Singh <jassi.brar@samsung.com>
+> >> + * ? Jaswinder Singh <jassi.brar@samsung.com>
 > >> + *
 > >> + * This program is free software; you can redistribute it and/or modify
 > >> + * it under the terms of the GNU General Public License version 2 as
@@ -43,11 +43,11 @@ right header without having to work out what is being included.
 > >> +#ifndef __S3C64XX_PLAT_SPI_H
 > >> +#define __S3C64XX_PLAT_SPI_H __FILE__
 > >> +
-> >> +#define S3C64XX_SPI_SRCCLK_PCLK              0
-> >> +#define S3C64XX_SPI_SRCCLK_SPIBUS    1
-> >> +#define S3C64XX_SPI_SRCCLK_48M               2
+> >> +#define S3C64XX_SPI_SRCCLK_PCLK ? ? ? ? ? ? ?0
+> >> +#define S3C64XX_SPI_SRCCLK_SPIBUS ? ?1
+> >> +#define S3C64XX_SPI_SRCCLK_48M ? ? ? ? ? ? ? 2
 > >> +
-> >> +#define BUSNUM(b)            (b)
+> >> +#define BUSNUM(b) ? ? ? ? ? ?(b)
 > >> +
 > >> +/**
 > >> + * struct s3c64xx_spi_csinfo - ChipSelect description
@@ -55,8 +55,8 @@ right header without having to work out what is being included.
 > >> + * @set_level: CS line control.
 > >> + */
 > >> +struct s3c64xx_spi_csinfo {
-> >> +     u8 fb_delay;
-> >> +     void (*set_level)(int lvl);
+> >> + ? ? u8 fb_delay;
+> >> + ? ? void (*set_level)(int lvl);
 > >> +};
 > >
 > > I think set_level should be called 'set_cs' to make it clearer what is
@@ -83,24 +83,24 @@ right header without having to work out what is being included.
 > > s3c64xx_spi_info instead?
 > Sure.
 > 
-> >> +     int src_clk_nr;
-> >> +     char *src_clk_name;
-> >> +     struct clk *src_clk;
+> >> + ? ? int src_clk_nr;
+> >> + ? ? char *src_clk_name;
+> >> + ? ? struct clk *src_clk;
 > >
 > > do not pass 'struct clk *' in via platform data.
 > Since this is not initialized in platform code: just a pointer
 > made available to the driver. So, yes, this can be made a
 > member of s3c64xx_spi_driver_data rather.
 > 
-> >> +     int num_cs;
-> >> +     struct s3c64xx_spi_csinfo *cs;
+> >> + ? ? int num_cs;
+> >> + ? ? struct s3c64xx_spi_csinfo *cs;
 > >> +
-> >> +     int (*cfg_gpio)(struct platform_device *pdev);
+> >> + ? ? int (*cfg_gpio)(struct platform_device *pdev);
 > >> +
-> >> +     /* Following two fields are for future compatibility */
-> >> +     int fifo_lvl_mask;
-> >> +     int rx_lvl_offset;
-> >> +     int high_speed;
+> >> + ? ? /* Following two fields are for future compatibility */
+> >> + ? ? int fifo_lvl_mask;
+> >> + ? ? int rx_lvl_offset;
+> >> + ? ? int high_speed;
 > >> +};
 > >
 > > I was wondering if a single 'set_cs' callback here would be in order,
@@ -123,7 +123,7 @@ adding to the complexity of the platform data.
  
 > >> +/**
 > >> + * s3c64xx_spi_set_info - SPI Controller configure callback by the board
-> >> + *                           initialization code.
+> >> + * ? ? ? ? ? ? ? ? ? ? ? ? ? initialization code.
 > >> + * @cntrlr: SPI controller number the configuration is for.
 > >> + * @src_clk_nr: Clock the SPI controller is to use to generate SPI clocks.
 > >> + * @cs: Pointer to the array of CS descriptions.
@@ -138,26 +138,26 @@ adding to the complexity of the platform data.
 > >>
 > >> _______________________________________________
 > >> 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
 > >
 > > --
 > > --
 > > Ben
 > >
-> > Q:      What's a light-year?
-> > A:      One-third less calories than a regular year.
+> > Q: ? ? ?What's a light-year?
+> > A: ? ? ?One-third less calories than a regular year.
 > >
 > >
 > > _______________________________________________
 > > 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
 > >
 > 
 > _______________________________________________
 > 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 5df3b9a..f7c52c2 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,15 +1,10 @@
  "ref\01259218097-9845-1-git-send-email-jassi.brar@samsung.com\0"
  "ref\020091203220637.GR4808@trinity.fluff.org\0"
  "ref\01b68c6790912040306m3098cba9wf67bfe5bfefb7e23@mail.gmail.com\0"
- "From\0Ben Dooks <ben-linux@fluff.org>\0"
- "Subject\0Re: [PATCH 3/5] SPI S3C64XX: Header for passing platform data\0"
+ "From\0ben-linux@fluff.org (Ben Dooks)\0"
+ "Subject\0[PATCH 3/5] SPI S3C64XX: Header for passing platform data\0"
  "Date\0Mon, 7 Dec 2009 14:41:45 +0000\0"
- "To\0jassi brar <jassisinghbrar@gmail.com>\0"
- "Cc\0Ben Dooks <ben-linux@fluff.org>"
-  dbrownell@users.sourceforge.net
-  linux-mmc@vger.kernel.org
-  linux-arm-kernel@lists.infradead.org
- " Jassi Brar <jassi.brar@samsung.com>\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Fri, Dec 04, 2009 at 08:06:12PM +0900, jassi brar wrote:\n"
@@ -20,9 +15,9 @@
  "> >>\n"
  "> >> Signed-off-by: Jassi Brar <jassi.brar@samsung.com>\n"
  "> >> ---\n"
- "> >> \302\240arch/arm/plat-s3c64xx/include/plat/spi.h | \302\240 68 ++++++++++++++++++++++++++++++\n"
- "> >> \302\2401 files changed, 68 insertions(+), 0 deletions(-)\n"
- "> >> \302\240create mode 100644 arch/arm/plat-s3c64xx/include/plat/spi.h\n"
+ "> >> ?arch/arm/plat-s3c64xx/include/plat/spi.h | ? 68 ++++++++++++++++++++++++++++++\n"
+ "> >> ?1 files changed, 68 insertions(+), 0 deletions(-)\n"
+ "> >> ?create mode 100644 arch/arm/plat-s3c64xx/include/plat/spi.h\n"
  "> >>\n"
  "> >> diff --git a/arch/arm/plat-s3c64xx/include/plat/spi.h b/arch/arm/plat-s3c64xx/include/plat/spi.h\n"
  "> >> new file mode 100644\n"
@@ -47,7 +42,7 @@
  "> >> +/* linux/arch/arm/plat-s3c64xx/include/plat/spi.h\n"
  "> >> + *\n"
  "> >> + * Copyright (C) 2009 Samsung Electronics Ltd.\n"
- "> >> + * \302\240 Jaswinder Singh <jassi.brar@samsung.com>\n"
+ "> >> + * ? Jaswinder Singh <jassi.brar@samsung.com>\n"
  "> >> + *\n"
  "> >> + * This program is free software; you can redistribute it and/or modify\n"
  "> >> + * it under the terms of the GNU General Public License version 2 as\n"
@@ -57,11 +52,11 @@
  "> >> +#ifndef __S3C64XX_PLAT_SPI_H\n"
  "> >> +#define __S3C64XX_PLAT_SPI_H __FILE__\n"
  "> >> +\n"
- "> >> +#define S3C64XX_SPI_SRCCLK_PCLK \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\2400\n"
- "> >> +#define S3C64XX_SPI_SRCCLK_SPIBUS \302\240 \302\2401\n"
- "> >> +#define S3C64XX_SPI_SRCCLK_48M \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 2\n"
+ "> >> +#define S3C64XX_SPI_SRCCLK_PCLK ? ? ? ? ? ? ?0\n"
+ "> >> +#define S3C64XX_SPI_SRCCLK_SPIBUS ? ?1\n"
+ "> >> +#define S3C64XX_SPI_SRCCLK_48M ? ? ? ? ? ? ? 2\n"
  "> >> +\n"
- "> >> +#define BUSNUM(b) \302\240 \302\240 \302\240 \302\240 \302\240 \302\240(b)\n"
+ "> >> +#define BUSNUM(b) ? ? ? ? ? ?(b)\n"
  "> >> +\n"
  "> >> +/**\n"
  "> >> + * struct s3c64xx_spi_csinfo - ChipSelect description\n"
@@ -69,8 +64,8 @@
  "> >> + * @set_level: CS line control.\n"
  "> >> + */\n"
  "> >> +struct s3c64xx_spi_csinfo {\n"
- "> >> + \302\240 \302\240 u8 fb_delay;\n"
- "> >> + \302\240 \302\240 void (*set_level)(int lvl);\n"
+ "> >> + ? ? u8 fb_delay;\n"
+ "> >> + ? ? void (*set_level)(int lvl);\n"
  "> >> +};\n"
  "> >\n"
  "> > I think set_level should be called 'set_cs' to make it clearer what is\n"
@@ -97,24 +92,24 @@
  "> > s3c64xx_spi_info instead?\n"
  "> Sure.\n"
  "> \n"
- "> >> + \302\240 \302\240 int src_clk_nr;\n"
- "> >> + \302\240 \302\240 char *src_clk_name;\n"
- "> >> + \302\240 \302\240 struct clk *src_clk;\n"
+ "> >> + ? ? int src_clk_nr;\n"
+ "> >> + ? ? char *src_clk_name;\n"
+ "> >> + ? ? struct clk *src_clk;\n"
  "> >\n"
  "> > do not pass 'struct clk *' in via platform data.\n"
  "> Since this is not initialized in platform code: just a pointer\n"
  "> made available to the driver. So, yes, this can be made a\n"
  "> member of s3c64xx_spi_driver_data rather.\n"
  "> \n"
- "> >> + \302\240 \302\240 int num_cs;\n"
- "> >> + \302\240 \302\240 struct s3c64xx_spi_csinfo *cs;\n"
+ "> >> + ? ? int num_cs;\n"
+ "> >> + ? ? struct s3c64xx_spi_csinfo *cs;\n"
  "> >> +\n"
- "> >> + \302\240 \302\240 int (*cfg_gpio)(struct platform_device *pdev);\n"
+ "> >> + ? ? int (*cfg_gpio)(struct platform_device *pdev);\n"
  "> >> +\n"
- "> >> + \302\240 \302\240 /* Following two fields are for future compatibility */\n"
- "> >> + \302\240 \302\240 int fifo_lvl_mask;\n"
- "> >> + \302\240 \302\240 int rx_lvl_offset;\n"
- "> >> + \302\240 \302\240 int high_speed;\n"
+ "> >> + ? ? /* Following two fields are for future compatibility */\n"
+ "> >> + ? ? int fifo_lvl_mask;\n"
+ "> >> + ? ? int rx_lvl_offset;\n"
+ "> >> + ? ? int high_speed;\n"
  "> >> +};\n"
  "> >\n"
  "> > I was wondering if a single 'set_cs' callback here would be in order,\n"
@@ -137,7 +132,7 @@
  " \n"
  "> >> +/**\n"
  "> >> + * s3c64xx_spi_set_info - SPI Controller configure callback by the board\n"
- "> >> + * \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 initialization code.\n"
+ "> >> + * ? ? ? ? ? ? ? ? ? ? ? ? ? initialization code.\n"
  "> >> + * @cntrlr: SPI controller number the configuration is for.\n"
  "> >> + * @src_clk_nr: Clock the SPI controller is to use to generate SPI clocks.\n"
  "> >> + * @cs: Pointer to the array of CS descriptions.\n"
@@ -152,26 +147,26 @@
  "> >>\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\n"
  "> >\n"
  "> > --\n"
  "> > --\n"
  "> > Ben\n"
  "> >\n"
- "> > Q: \302\240 \302\240 \302\240What's a light-year?\n"
- "> > A: \302\240 \302\240 \302\240One-third less calories than a regular year.\n"
+ "> > Q: ? ? ?What's a light-year?\n"
+ "> > A: ? ? ?One-third less calories than a regular year.\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\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\n"
  "\n"
  "-- \n"
@@ -181,4 +176,4 @@
  "Q:      What's a light-year?\n"
  A:      One-third less calories than a regular year.
 
-9444199baaeaeb0db81348b5f58e581d2761d005bb6608f14c6430b51b28e9f4
+31efc7bce258ea68f715b6e5f69fef098aad1c682a326010e8544c9295ced418
