diff for duplicates of <200908220105.52244.marek.vasut@gmail.com>

diff --git a/a/1.txt b/N1/1.txt
index d22dbc3..af2b29c 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -5,3 +5,10 @@ applying? Thanks!
 
 Cheers!
 Marek Vasut
+-------------- next part --------------
+A non-text attachment was scrubbed...
+Name: 0001-Convert-WM97xx-battery-to-dev_pm_ops.patch
+Type: text/x-patch
+Size: 1661 bytes
+Desc: not available
+URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20090822/10ad7529/attachment.bin>
diff --git a/a/2.hdr b/a/2.hdr
deleted file mode 100644
index 073e962..0000000
--- a/a/2.hdr
+++ /dev/null
@@ -1,6 +0,0 @@
-Content-Type: text/x-patch;
-  charset="UTF-8";
-  name="0001-Convert-WM97xx-battery-to-dev_pm_ops.patch"
-Content-Transfer-Encoding: quoted-printable
-Content-Disposition: attachment;
-	filename="0001-Convert-WM97xx-battery-to-dev_pm_ops.patch"
diff --git a/a/2.txt b/a/2.txt
deleted file mode 100644
index 84383b5..0000000
--- a/a/2.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-From 90955155d905ac8222af37317379cb084ba850ea Mon Sep 17 00:00:00 2001
-From: Marek Vasut <marek.vasut@gmail.com>
-Date: Sat, 22 Aug 2009 00:36:43 +0200
-Subject: [PATCH] Convert WM97xx-battery to dev_pm_ops
-
-Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
----
- drivers/power/wm97xx_battery.c |   17 ++++++++++-------
- 1 files changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c
-index 98f2f37..af6d3cd 100644
---- a/drivers/power/wm97xx_battery.c
-+++ b/drivers/power/wm97xx_battery.c
-@@ -144,20 +144,22 @@ static irqreturn_t wm97xx_chrg_irq(int irq, void *data)
- }
- 
- #ifdef CONFIG_PM
--static int wm97xx_bat_suspend(struct platform_device *dev, pm_message_t state)
-+static int wm97xx_bat_suspend(struct device *dev)
- {
- 	flush_scheduled_work();
- 	return 0;
- }
- 
--static int wm97xx_bat_resume(struct platform_device *dev)
-+static int wm97xx_bat_resume(struct device *dev)
- {
- 	schedule_work(&bat_work);
- 	return 0;
- }
--#else
--#define wm97xx_bat_suspend NULL
--#define wm97xx_bat_resume NULL
-+
-+static const struct dev_pm_ops wm97xx_bat_pm_ops = {
-+	.suspend	= wm97xx_bat_suspend,
-+	.resume		= wm97xx_bat_resume,
-+};
- #endif
- 
- static int __devinit wm97xx_bat_probe(struct platform_device *dev)
-@@ -273,11 +275,12 @@ static struct platform_driver wm97xx_bat_driver = {
- 	.driver	= {
- 		.name	= "wm97xx-battery",
- 		.owner	= THIS_MODULE,
-+#ifdef CONFIG_PM
-+		.pm	= &wm97xx_bat_pm_ops,
-+#endif
- 	},
- 	.probe		= wm97xx_bat_probe,
- 	.remove		= __devexit_p(wm97xx_bat_remove),
--	.suspend	= wm97xx_bat_suspend,
--	.resume		= wm97xx_bat_resume,
- };
- 
- static int __init wm97xx_bat_init(void)
--- 
-1.6.3.3
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 1b730e0..0000000
--- a/a/3.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-_______________________________________________
-Alsa-devel mailing list
-Alsa-devel@alsa-project.org
-http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
diff --git a/a/content_digest b/N1/content_digest
index 3d20dab..5f1a0db 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,12 +1,8 @@
- "From\0Marek Vasut <marek.vasut@gmail.com>\0"
+ "From\0marek.vasut@gmail.com (Marek Vasut)\0"
  "Subject\0[PATCH] Convert WM97xx-battery to dev_pm_ops\0"
  "Date\0Sat, 22 Aug 2009 01:05:52 +0200\0"
- "To\0alsa-devel@alsa-project.org\0"
- "Cc\0avorontsov@ru.mvista.com"
-  Robert Jarzmik <robert.jarzmik@free.fr>
-  linux-arm-kernel@lists.infradead.org
- " Mark Brown <broonie@opensource.wolfsonmicro.com>\0"
- "\01:1\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
+ "\00:1\0"
  "b\0"
  "Hi,\n"
  "\n"
@@ -14,74 +10,13 @@
  "applying? Thanks!\n"
  "\n"
  "Cheers!\n"
- Marek Vasut
- "\01:2\0"
- "fn\00001-Convert-WM97xx-battery-to-dev_pm_ops.patch\0"
- "b\0"
- "From 90955155d905ac8222af37317379cb084ba850ea Mon Sep 17 00:00:00 2001\n"
- "From: Marek Vasut <marek.vasut@gmail.com>\n"
- "Date: Sat, 22 Aug 2009 00:36:43 +0200\n"
- "Subject: [PATCH] Convert WM97xx-battery to dev_pm_ops\n"
- "\n"
- "Signed-off-by: Marek Vasut <marek.vasut@gmail.com>\n"
- "---\n"
- " drivers/power/wm97xx_battery.c |   17 ++++++++++-------\n"
- " 1 files changed, 10 insertions(+), 7 deletions(-)\n"
- "\n"
- "diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c\n"
- "index 98f2f37..af6d3cd 100644\n"
- "--- a/drivers/power/wm97xx_battery.c\n"
- "+++ b/drivers/power/wm97xx_battery.c\n"
- "@@ -144,20 +144,22 @@ static irqreturn_t wm97xx_chrg_irq(int irq, void *data)\n"
- " }\n"
- " \n"
- " #ifdef CONFIG_PM\n"
- "-static int wm97xx_bat_suspend(struct platform_device *dev, pm_message_t state)\n"
- "+static int wm97xx_bat_suspend(struct device *dev)\n"
- " {\n"
- " \tflush_scheduled_work();\n"
- " \treturn 0;\n"
- " }\n"
- " \n"
- "-static int wm97xx_bat_resume(struct platform_device *dev)\n"
- "+static int wm97xx_bat_resume(struct device *dev)\n"
- " {\n"
- " \tschedule_work(&bat_work);\n"
- " \treturn 0;\n"
- " }\n"
- "-#else\n"
- "-#define wm97xx_bat_suspend NULL\n"
- "-#define wm97xx_bat_resume NULL\n"
- "+\n"
- "+static const struct dev_pm_ops wm97xx_bat_pm_ops = {\n"
- "+\t.suspend\t= wm97xx_bat_suspend,\n"
- "+\t.resume\t\t= wm97xx_bat_resume,\n"
- "+};\n"
- " #endif\n"
- " \n"
- " static int __devinit wm97xx_bat_probe(struct platform_device *dev)\n"
- "@@ -273,11 +275,12 @@ static struct platform_driver wm97xx_bat_driver = {\n"
- " \t.driver\t= {\n"
- " \t\t.name\t= \"wm97xx-battery\",\n"
- " \t\t.owner\t= THIS_MODULE,\n"
- "+#ifdef CONFIG_PM\n"
- "+\t\t.pm\t= &wm97xx_bat_pm_ops,\n"
- "+#endif\n"
- " \t},\n"
- " \t.probe\t\t= wm97xx_bat_probe,\n"
- " \t.remove\t\t= __devexit_p(wm97xx_bat_remove),\n"
- "-\t.suspend\t= wm97xx_bat_suspend,\n"
- "-\t.resume\t\t= wm97xx_bat_resume,\n"
- " };\n"
- " \n"
- " static int __init wm97xx_bat_init(void)\n"
- "-- \n"
- 1.6.3.3
- "\01:3\0"
- "b\0"
- "_______________________________________________\n"
- "Alsa-devel mailing list\n"
- "Alsa-devel@alsa-project.org\n"
- http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
+ "Marek Vasut\n"
+ "-------------- next part --------------\n"
+ "A non-text attachment was scrubbed...\n"
+ "Name: 0001-Convert-WM97xx-battery-to-dev_pm_ops.patch\n"
+ "Type: text/x-patch\n"
+ "Size: 1661 bytes\n"
+ "Desc: not available\n"
+ URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20090822/10ad7529/attachment.bin>
 
-cbced8087e4204f706d3b17c0b45561e9c6fd47277d688cbca446058782abb49
+748ed7ac03da75cd4f6b741d543772fdb1da4485b40dd66a3408ea2c6f085c29
