diff for duplicates of <68b4be46e93b4017650bc4bf230afef6@mail.gmail.com>

diff --git a/a/1.txt b/N1/1.txt
index 6fbeef2..9e89fca 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,11 +1,11 @@
 Russell, Thomas
 > -----Original Message-----
-> From: Russell King - ARM Linux [mailto:linux@arm.linux.org.uk]
+> From: Russell King - ARM Linux [mailto:linux at arm.linux.org.uk]
 > Sent: Tuesday, January 25, 2011 7:08 PM
 > To: Thomas Gleixner
-> Cc: Colin Cross; Santosh Shilimkar; catalin.marinas@arm.com;
-> linus.ml.walleij@gmail.com; linux-omap@vger.kernel.org; linux-arm-
-> kernel@lists.infradead.org
+> Cc: Colin Cross; Santosh Shilimkar; catalin.marinas at arm.com;
+> linus.ml.walleij at gmail.com; linux-omap at vger.kernel.org; linux-arm-
+> kernel at lists.infradead.org
 > Subject: Re: [PATCH 3/5] ARM: twd: Add context save restore support
 >
 [...]
@@ -38,53 +38,3 @@ earlier :(
 Thanks for the discussion.
 
 -----------------
->From 9084dd3e68a8528172d97fb49c42437ae873af43 Mon Sep 17 00:00:00 2001
-From: Russell King <rmk+kernel@arm.linux.org.uk>
-Date: Tue, 25 Jan 2011 14:26:41 +0530
-Subject: [PATCH] ARM: smp_twd: Always program the loadvalue when switching
-to periodic mode.
-
-Always program the load value when switching to periodic mode so that
-we don't need to save restore twd load register.
-
-Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
----
- arch/arm/kernel/smp_twd.c |    7 ++-----
- 1 files changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
-index fd91566..60636f4 100644
---- a/arch/arm/kernel/smp_twd.c
-+++ b/arch/arm/kernel/smp_twd.c
-@@ -36,6 +36,7 @@ static void twd_set_mode(enum clock_event_mode mode,
- 		/* timer load already set up */
- 		ctrl = TWD_TIMER_CONTROL_ENABLE |
-TWD_TIMER_CONTROL_IT_ENABLE
- 			| TWD_TIMER_CONTROL_PERIODIC;
-+		__raw_writel(twd_timer_rate / HZ, twd_base +
-TWD_TIMER_LOAD);
- 		break;
- 	case CLOCK_EVT_MODE_ONESHOT:
- 		/* period set, and timer enabled in 'next_event' hook */
-@@ -81,7 +82,7 @@ int twd_timer_ack(void)
-
- static void __cpuinit twd_calibrate_rate(void)
- {
--	unsigned long load, count;
-+	unsigned long count;
- 	u64 waitjiffies;
-
- 	/*
-@@ -116,10 +117,6 @@ static void __cpuinit twd_calibrate_rate(void)
- 		printk("%lu.%02luMHz.\n", twd_timer_rate / 1000000,
- 			(twd_timer_rate / 1000000) % 100);
- 	}
--
--	load = twd_timer_rate / HZ;
--
--	__raw_writel(load, twd_base + TWD_TIMER_LOAD);
- }
-
- /*
--- 
-1.6.0.4
diff --git a/a/2.hdr b/a/2.hdr
deleted file mode 100644
index 10cc4b1..0000000
--- a/a/2.hdr
+++ /dev/null
@@ -1,6 +0,0 @@
-Content-Type: application/octet-stream;
-	name="0001-ARM-smp_twd-Always-program-the-loadvalue-when-swit.patch"
-Content-Disposition: attachment;
-	filename="0001-ARM-smp_twd-Always-program-the-loadvalue-when-swit.patch"
-Content-Transfer-Encoding: base64
-X-Attachment-Id: c33e3ae155501f20_0.1
diff --git a/a/2.txt b/a/2.txt
deleted file mode 100644
index 5a39502..0000000
--- a/a/2.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-From 9084dd3e68a8528172d97fb49c42437ae873af43 Mon Sep 17 00:00:00 2001
-From: Russell King <rmk+kernel@arm.linux.org.uk>
-Date: Tue, 25 Jan 2011 14:26:41 +0530
-Subject: [PATCH] ARM: smp_twd: Always program the loadvalue when switching to periodic mode.
-
-Always program the load value when switching to periodic mode so that
-we don't need to save restore twd load register.
-
-Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
----
- arch/arm/kernel/smp_twd.c |    7 ++-----
- 1 files changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
-index fd91566..60636f4 100644
---- a/arch/arm/kernel/smp_twd.c
-+++ b/arch/arm/kernel/smp_twd.c
-@@ -36,6 +36,7 @@ static void twd_set_mode(enum clock_event_mode mode,
- 		/* timer load already set up */
- 		ctrl = TWD_TIMER_CONTROL_ENABLE | TWD_TIMER_CONTROL_IT_ENABLE
- 			| TWD_TIMER_CONTROL_PERIODIC;
-+		__raw_writel(twd_timer_rate / HZ, twd_base + TWD_TIMER_LOAD);
- 		break;
- 	case CLOCK_EVT_MODE_ONESHOT:
- 		/* period set, and timer enabled in 'next_event' hook */
-@@ -81,7 +82,7 @@ int twd_timer_ack(void)
- 
- static void __cpuinit twd_calibrate_rate(void)
- {
--	unsigned long load, count;
-+	unsigned long count;
- 	u64 waitjiffies;
- 
- 	/*
-@@ -116,10 +117,6 @@ static void __cpuinit twd_calibrate_rate(void)
- 		printk("%lu.%02luMHz.\n", twd_timer_rate / 1000000,
- 			(twd_timer_rate / 1000000) % 100);
- 	}
--
--	load = twd_timer_rate / HZ;
--
--	__raw_writel(load, twd_base + TWD_TIMER_LOAD);
- }
- 
- /*
--- 
-1.6.0.4
diff --git a/a/3.hdr b/a/3.hdr
deleted file mode 100644
index 4b86001..0000000
--- a/a/3.hdr
+++ /dev/null
@@ -1,4 +0,0 @@
-Content-Type: text/plain; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Content-Disposition: inline
diff --git a/a/3.txt b/a/3.txt
deleted file mode 100644
index 8133cf0..0000000
--- a/a/3.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-_______________________________________________
-linux-arm-kernel mailing list
-linux-arm-kernel@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/a/content_digest b/N1/content_digest
index 6371a16..4a5d712 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -6,26 +6,20 @@
  "ref\020110125103231.GD11507@n2100.arm.linux.org.uk\0"
  "ref\0alpine.LFD.2.00.1101251418260.31804@localhost6.localdomain6\0"
  "ref\020110125133752.GI13300@n2100.arm.linux.org.uk\0"
- "From\0Santosh Shilimkar <santosh.shilimkar@ti.com>\0"
- "Subject\0RE: [PATCH 3/5] ARM: twd: Add context save restore support\0"
+ "From\0santosh.shilimkar@ti.com (Santosh Shilimkar)\0"
+ "Subject\0[PATCH 3/5] ARM: twd: Add context save restore support\0"
  "Date\0Tue, 25 Jan 2011 21:34:15 +0530\0"
- "To\0Russell King - ARM Linux <linux@arm.linux.org.uk>"
- " Thomas Gleixner <tglx@linutronix.de>\0"
- "Cc\0catalin.marinas@arm.com"
-  linus.ml.walleij@gmail.com
-  linux-omap@vger.kernel.org
-  linux-arm-kernel@lists.infradead.org
- " Colin Cross <ccross@android.com>\0"
- "\01:1\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
+ "\00:1\0"
  "b\0"
  "Russell, Thomas\n"
  "> -----Original Message-----\n"
- "> From: Russell King - ARM Linux [mailto:linux@arm.linux.org.uk]\n"
+ "> From: Russell King - ARM Linux [mailto:linux at arm.linux.org.uk]\n"
  "> Sent: Tuesday, January 25, 2011 7:08 PM\n"
  "> To: Thomas Gleixner\n"
- "> Cc: Colin Cross; Santosh Shilimkar; catalin.marinas@arm.com;\n"
- "> linus.ml.walleij@gmail.com; linux-omap@vger.kernel.org; linux-arm-\n"
- "> kernel@lists.infradead.org\n"
+ "> Cc: Colin Cross; Santosh Shilimkar; catalin.marinas at arm.com;\n"
+ "> linus.ml.walleij at gmail.com; linux-omap at vger.kernel.org; linux-arm-\n"
+ "> kernel at lists.infradead.org\n"
  "> Subject: Re: [PATCH 3/5] ARM: twd: Add context save restore support\n"
  ">\n"
  "[...]\n"
@@ -57,112 +51,6 @@
  "\n"
  "Thanks for the discussion.\n"
  "\n"
- "-----------------\n"
- ">From 9084dd3e68a8528172d97fb49c42437ae873af43 Mon Sep 17 00:00:00 2001\n"
- "From: Russell King <rmk+kernel@arm.linux.org.uk>\n"
- "Date: Tue, 25 Jan 2011 14:26:41 +0530\n"
- "Subject: [PATCH] ARM: smp_twd: Always program the loadvalue when switching\n"
- "to periodic mode.\n"
- "\n"
- "Always program the load value when switching to periodic mode so that\n"
- "we don't need to save restore twd load register.\n"
- "\n"
- "Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>\n"
- "---\n"
- " arch/arm/kernel/smp_twd.c |    7 ++-----\n"
- " 1 files changed, 2 insertions(+), 5 deletions(-)\n"
- "\n"
- "diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c\n"
- "index fd91566..60636f4 100644\n"
- "--- a/arch/arm/kernel/smp_twd.c\n"
- "+++ b/arch/arm/kernel/smp_twd.c\n"
- "@@ -36,6 +36,7 @@ static void twd_set_mode(enum clock_event_mode mode,\n"
- " \t\t/* timer load already set up */\n"
- " \t\tctrl = TWD_TIMER_CONTROL_ENABLE |\n"
- "TWD_TIMER_CONTROL_IT_ENABLE\n"
- " \t\t\t| TWD_TIMER_CONTROL_PERIODIC;\n"
- "+\t\t__raw_writel(twd_timer_rate / HZ, twd_base +\n"
- "TWD_TIMER_LOAD);\n"
- " \t\tbreak;\n"
- " \tcase CLOCK_EVT_MODE_ONESHOT:\n"
- " \t\t/* period set, and timer enabled in 'next_event' hook */\n"
- "@@ -81,7 +82,7 @@ int twd_timer_ack(void)\n"
- "\n"
- " static void __cpuinit twd_calibrate_rate(void)\n"
- " {\n"
- "-\tunsigned long load, count;\n"
- "+\tunsigned long count;\n"
- " \tu64 waitjiffies;\n"
- "\n"
- " \t/*\n"
- "@@ -116,10 +117,6 @@ static void __cpuinit twd_calibrate_rate(void)\n"
- " \t\tprintk(\"%lu.%02luMHz.\\n\", twd_timer_rate / 1000000,\n"
- " \t\t\t(twd_timer_rate / 1000000) % 100);\n"
- " \t}\n"
- "-\n"
- "-\tload = twd_timer_rate / HZ;\n"
- "-\n"
- "-\t__raw_writel(load, twd_base + TWD_TIMER_LOAD);\n"
- " }\n"
- "\n"
- " /*\n"
- "-- \n"
- 1.6.0.4
- "\01:2\0"
- "fn\00001-ARM-smp_twd-Always-program-the-loadvalue-when-swit.patch\0"
- "b\0"
- "From 9084dd3e68a8528172d97fb49c42437ae873af43 Mon Sep 17 00:00:00 2001\n"
- "From: Russell King <rmk+kernel@arm.linux.org.uk>\n"
- "Date: Tue, 25 Jan 2011 14:26:41 +0530\n"
- "Subject: [PATCH] ARM: smp_twd: Always program the loadvalue when switching to periodic mode.\n"
- "\n"
- "Always program the load value when switching to periodic mode so that\n"
- "we don't need to save restore twd load register.\n"
- "\n"
- "Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>\n"
- "---\n"
- " arch/arm/kernel/smp_twd.c |    7 ++-----\n"
- " 1 files changed, 2 insertions(+), 5 deletions(-)\n"
- "\n"
- "diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c\n"
- "index fd91566..60636f4 100644\n"
- "--- a/arch/arm/kernel/smp_twd.c\n"
- "+++ b/arch/arm/kernel/smp_twd.c\n"
- "@@ -36,6 +36,7 @@ static void twd_set_mode(enum clock_event_mode mode,\n"
- " \t\t/* timer load already set up */\n"
- " \t\tctrl = TWD_TIMER_CONTROL_ENABLE | TWD_TIMER_CONTROL_IT_ENABLE\n"
- " \t\t\t| TWD_TIMER_CONTROL_PERIODIC;\n"
- "+\t\t__raw_writel(twd_timer_rate / HZ, twd_base + TWD_TIMER_LOAD);\n"
- " \t\tbreak;\n"
- " \tcase CLOCK_EVT_MODE_ONESHOT:\n"
- " \t\t/* period set, and timer enabled in 'next_event' hook */\n"
- "@@ -81,7 +82,7 @@ int twd_timer_ack(void)\n"
- " \n"
- " static void __cpuinit twd_calibrate_rate(void)\n"
- " {\n"
- "-\tunsigned long load, count;\n"
- "+\tunsigned long count;\n"
- " \tu64 waitjiffies;\n"
- " \n"
- " \t/*\n"
- "@@ -116,10 +117,6 @@ static void __cpuinit twd_calibrate_rate(void)\n"
- " \t\tprintk(\"%lu.%02luMHz.\\n\", twd_timer_rate / 1000000,\n"
- " \t\t\t(twd_timer_rate / 1000000) % 100);\n"
- " \t}\n"
- "-\n"
- "-\tload = twd_timer_rate / HZ;\n"
- "-\n"
- "-\t__raw_writel(load, twd_base + TWD_TIMER_LOAD);\n"
- " }\n"
- " \n"
- " /*\n"
- "-- \n"
- 1.6.0.4
- "\01:3\0"
- "b\0"
- "_______________________________________________\n"
- "linux-arm-kernel mailing list\n"
- "linux-arm-kernel@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+ -----------------
 
-c0a1764d656c2e870657e74694d7eb868498a5c190966769e342b421003a9d3f
+c70fb0b0149bc1b6939f0ad650a613189b66aa4cc5a407627fae341dbb811d9b
