diff for duplicates of <4CEE05A4.6030201@compulab.co.il>

diff --git a/a/1.txt b/N1/1.txt
index 3f13647..199dc47 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -2,9 +2,9 @@
 
 On 11/25/10 04:49, Haojian Zhuang wrote:
 > On Thu, Nov 25, 2010 at 10:30 AM, Haojian Zhuang
-> <haojian.zhuang-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
+> <haojian.zhuang@gmail.com> wrote:
 >> On Thu, Nov 25, 2010 at 5:20 AM, Sebastian Andrzej Siewior
->> <bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> wrote:
+>> <bigeasy@linutronix.de> wrote:
 >>> I haven't seen this (yet) during a normal transfer but starting
 >>> i2cdetect seems to hang the bus. On my Sodaville board, i2cdetect runs
 >>> fine on bus zero and runs into timeouts on bus one and two. The chip
@@ -12,8 +12,8 @@ On 11/25/10 04:49, Haojian Zhuang wrote:
 >>> well. The ISR_UB never disappears.
 >>> Issuing a chip reset fixes the timeout and following transfer succeed.
 >>>
->>> Signed-off-by: Sebastian Andrzej Siewior <bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
->>> Signed-off-by: Dirk Brandewie <dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
+>>> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+>>> Signed-off-by: Dirk Brandewie <dirk.brandewie@gmail.com>
 >>> ---
 >>>  drivers/i2c/busses/i2c-pxa.c |   35 +++++++++++++++++++----------------
 >>>  1 files changed, 19 insertions(+), 16 deletions(-)
@@ -80,32 +80,3 @@ As for PXA3xx, the Developer Manual states:
 "Software must ensure that the TWSI unit is not busy (ISR[UB] = 0)
 before it asserts a reset. Software must also ensure that the TWSI bus is idle (ISR[IBB] = 0)
 when the unit is enabled after reset."
-
->From my experience, in master mode resetting the controller
-does not help and if the bus is busy for too much time,
-there always was a h/w problem involved.
-
->>> +
->>> +       return timeout < 0 ? I2C_RETRY : 0;
->>> +}
->>>
->>>  #ifdef CONFIG_I2C_PXA_SLAVE
->>>  /*
->>> --
->>> 1.7.3.2
->>>
->>>
->>> _______________________________________________
->>> linux-arm-kernel mailing list
->>> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
->>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
->>>
-> _______________________________________________
-> linux-arm-kernel mailing list
-> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
-> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
->
-
--- 
-Regards,
-Igor.
diff --git a/a/content_digest b/N1/content_digest
index fd34232..9d6370e 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,29 +2,19 @@
  "ref\01290633617-15311-7-git-send-email-bigeasy@linutronix.de\0"
  "ref\0AANLkTikvN+==eTkoh7CTQyN0mbfvPhH6Uh9NX5QW7WFx@mail.gmail.com\0"
  "ref\0AANLkTi=8Xy3M7QGO54nt_r0_12z3+o8G5fAqQmxkTH4o@mail.gmail.com\0"
- "ref\0AANLkTi=8Xy3M7QGO54nt_r0_12z3+o8G5fAqQmxkTH4o-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org\0"
- "From\0Igor Grinberg <grinberg-UTxiZqZC01RS1MOuV/RT9w@public.gmane.org>\0"
- "Subject\0Re: [PATCH 6/7] i2c/pxa2xx: reset the chip if the bus is not free\0"
+ "From\0grinberg@compulab.co.il (Igor Grinberg)\0"
+ "Subject\0[PATCH 6/7] i2c/pxa2xx: reset the chip if the bus is not free\0"
  "Date\0Thu, 25 Nov 2010 08:43:48 +0200\0"
- "To\0Haojian Zhuang <haojian.zhuang-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0"
- "Cc\0Sebastian Andrzej Siewior <bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>"
-  eric.y.miao-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
-  sodaville-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org
-  linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org
-  Dirk Brandewie <dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
-  linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org
-  tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org
- " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  " Hi,\n"
  "\n"
  "On 11/25/10 04:49, Haojian Zhuang wrote:\n"
  "> On Thu, Nov 25, 2010 at 10:30 AM, Haojian Zhuang\n"
- "> <haojian.zhuang-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:\n"
+ "> <haojian.zhuang@gmail.com> wrote:\n"
  ">> On Thu, Nov 25, 2010 at 5:20 AM, Sebastian Andrzej Siewior\n"
- ">> <bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> wrote:\n"
+ ">> <bigeasy@linutronix.de> wrote:\n"
  ">>> I haven't seen this (yet) during a normal transfer but starting\n"
  ">>> i2cdetect seems to hang the bus. On my Sodaville board, i2cdetect runs\n"
  ">>> fine on bus zero and runs into timeouts on bus one and two. The chip\n"
@@ -32,8 +22,8 @@
  ">>> well. The ISR_UB never disappears.\n"
  ">>> Issuing a chip reset fixes the timeout and following transfer succeed.\n"
  ">>>\n"
- ">>> Signed-off-by: Sebastian Andrzej Siewior <bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>\n"
- ">>> Signed-off-by: Dirk Brandewie <dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n"
+ ">>> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>\n"
+ ">>> Signed-off-by: Dirk Brandewie <dirk.brandewie@gmail.com>\n"
  ">>> ---\n"
  ">>>  drivers/i2c/busses/i2c-pxa.c |   35 +++++++++++++++++++----------------\n"
  ">>>  1 files changed, 19 insertions(+), 16 deletions(-)\n"
@@ -99,35 +89,6 @@
  "As for PXA3xx, the Developer Manual states:\n"
  "\"Software must ensure that the TWSI unit is not busy (ISR[UB] = 0)\n"
  "before it asserts a reset. Software must also ensure that the TWSI bus is idle (ISR[IBB] = 0)\n"
- "when the unit is enabled after reset.\"\n"
- "\n"
- ">From my experience, in master mode resetting the controller\n"
- "does not help and if the bus is busy for too much time,\n"
- "there always was a h/w problem involved.\n"
- "\n"
- ">>> +\n"
- ">>> +       return timeout < 0 ? I2C_RETRY : 0;\n"
- ">>> +}\n"
- ">>>\n"
- ">>>  #ifdef CONFIG_I2C_PXA_SLAVE\n"
- ">>>  /*\n"
- ">>> --\n"
- ">>> 1.7.3.2\n"
- ">>>\n"
- ">>>\n"
- ">>> _______________________________________________\n"
- ">>> linux-arm-kernel mailing list\n"
- ">>> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\n"
- ">>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\n"
- ">>>\n"
- "> _______________________________________________\n"
- "> linux-arm-kernel mailing list\n"
- "> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\n"
- "> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\n"
- ">\n"
- "\n"
- "-- \n"
- "Regards,\n"
- Igor.
+ "when the unit is enabled after reset.\""
 
-15598338aa033eb14de859414aea9a19cccacf15cf020dae60ffcfa7a92b942e
+12ad829ddcb762e30b5ebb31ca28964f6625632227a88d77cac4bbad21027069
