diff for duplicates of <874ogrng3j.fsf@deeprootsystems.com>

diff --git a/a/1.txt b/N1/1.txt
index 2fb6521..b0d6607 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -3,7 +3,7 @@ Grant Likely <grant.likely@secretlab.ca> writes:
 > On Thu, Jun 24, 2010 at 5:43 PM, Kevin Hilman
 > <khilman@deeprootsystems.com> wrote:
 >> Implement the new runtime PM framework as a thin layer on top of the
->> omap_device API.  Since we don't have an OMAP-specific bus, override
+>> omap_device API. ?Since we don't have an OMAP-specific bus, override
 >> the runtime PM hooks for the platform_bus for the OMAP specific
 >> implementation.
 >>
@@ -111,34 +111,34 @@ Kevin
 >>
 >> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
 >> ---
->>  arch/arm/mach-omap2/Makefile |    7 +++-
->>  arch/arm/mach-omap2/pm_bus.c |   70 ++++++++++++++++++++++++++++++++++++++++++
->>  2 files changed, 76 insertions(+), 1 deletions(-)
->>  create mode 100644 arch/arm/mach-omap2/pm_bus.c
+>> ?arch/arm/mach-omap2/Makefile | ? ?7 +++-
+>> ?arch/arm/mach-omap2/pm_bus.c | ? 70 ++++++++++++++++++++++++++++++++++++++++++
+>> ?2 files changed, 76 insertions(+), 1 deletions(-)
+>> ?create mode 100644 arch/arm/mach-omap2/pm_bus.c
 >>
 >> diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
 >> index ea52b03..8ed47ea 100644
 >> --- a/arch/arm/mach-omap2/Makefile
 >> +++ b/arch/arm/mach-omap2/Makefile
->> @@ -46,12 +46,17 @@ obj-$(CONFIG_ARCH_OMAP2)            += sdrc2xxx.o
->>  ifeq ($(CONFIG_PM),y)
->>  obj-$(CONFIG_ARCH_OMAP2)               += pm24xx.o
->>  obj-$(CONFIG_ARCH_OMAP2)               += sleep24xx.o
->> -obj-$(CONFIG_ARCH_OMAP3)               += pm34xx.o sleep34xx.o cpuidle34xx.o
->> +obj-$(CONFIG_ARCH_OMAP3)               += pm34xx.o sleep34xx.o cpuidle34xx.o \
->> +                                          pm_bus.o
->>  obj-$(CONFIG_PM_DEBUG)                 += pm-debug.o
+>> @@ -46,12 +46,17 @@ obj-$(CONFIG_ARCH_OMAP2) ? ? ? ? ? ?+= sdrc2xxx.o
+>> ?ifeq ($(CONFIG_PM),y)
+>> ?obj-$(CONFIG_ARCH_OMAP2) ? ? ? ? ? ? ? += pm24xx.o
+>> ?obj-$(CONFIG_ARCH_OMAP2) ? ? ? ? ? ? ? += sleep24xx.o
+>> -obj-$(CONFIG_ARCH_OMAP3) ? ? ? ? ? ? ? += pm34xx.o sleep34xx.o cpuidle34xx.o
+>> +obj-$(CONFIG_ARCH_OMAP3) ? ? ? ? ? ? ? += pm34xx.o sleep34xx.o cpuidle34xx.o \
+>> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?pm_bus.o
+>> ?obj-$(CONFIG_PM_DEBUG) ? ? ? ? ? ? ? ? += pm-debug.o
 >>
->>  AFLAGS_sleep24xx.o                     :=-Wa,-march=armv6
->>  AFLAGS_sleep34xx.o                     :=-Wa,-march=armv7-a
+>> ?AFLAGS_sleep24xx.o ? ? ? ? ? ? ? ? ? ? :=-Wa,-march=armv6
+>> ?AFLAGS_sleep34xx.o ? ? ? ? ? ? ? ? ? ? :=-Wa,-march=armv7-a
 >>
 >> +ifeq ($(CONFIG_PM_VERBOSE),y)
->> +CFLAGS_pm_bus.o                                += -DDEBUG
+>> +CFLAGS_pm_bus.o ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?+= -DDEBUG
 >> +endif
 >> +
->>  endif
+>> ?endif
 >>
->>  # PRCM
+>> ?# PRCM
 >> diff --git a/arch/arm/mach-omap2/pm_bus.c b/arch/arm/mach-omap2/pm_bus.c
 >> new file mode 100644
 >> index 0000000..9719a9f
@@ -169,49 +169,49 @@ Kevin
 >> +#ifdef CONFIG_PM_RUNTIME
 >> +int platform_pm_runtime_suspend(struct device *dev)
 >> +{
->> +       struct platform_device *pdev = to_platform_device(dev);
->> +       struct omap_device *odev = to_omap_device(pdev);
->> +       int r, ret = 0;
+>> + ? ? ? struct platform_device *pdev = to_platform_device(dev);
+>> + ? ? ? struct omap_device *odev = to_omap_device(pdev);
+>> + ? ? ? int r, ret = 0;
 >> +
->> +       dev_dbg(dev, "%s\n", __func__);
+>> + ? ? ? dev_dbg(dev, "%s\n", __func__);
 >> +
->> +       if (dev->driver->pm && dev->driver->pm->runtime_suspend)
->> +               ret = dev->driver->pm->runtime_suspend(dev);
->> +       if (!ret && omap_device_is_valid(odev)) {
->> +               r = omap_device_idle(pdev);
->> +               WARN_ON(r);
->> +       }
+>> + ? ? ? if (dev->driver->pm && dev->driver->pm->runtime_suspend)
+>> + ? ? ? ? ? ? ? ret = dev->driver->pm->runtime_suspend(dev);
+>> + ? ? ? if (!ret && omap_device_is_valid(odev)) {
+>> + ? ? ? ? ? ? ? r = omap_device_idle(pdev);
+>> + ? ? ? ? ? ? ? WARN_ON(r);
+>> + ? ? ? }
 >> +
->> +       return ret;
+>> + ? ? ? return ret;
 >> +};
 >> +
 >> +int platform_pm_runtime_resume(struct device *dev)
 >> +{
->> +       struct platform_device *pdev = to_platform_device(dev);
->> +       struct omap_device *odev = to_omap_device(pdev);
->> +       int r, ret = 0;
+>> + ? ? ? struct platform_device *pdev = to_platform_device(dev);
+>> + ? ? ? struct omap_device *odev = to_omap_device(pdev);
+>> + ? ? ? int r, ret = 0;
 >> +
->> +       dev_dbg(dev, "%s\n", __func__);
+>> + ? ? ? dev_dbg(dev, "%s\n", __func__);
 >> +
->> +       if (omap_device_is_valid(odev)) {
->> +               r = omap_device_enable(pdev);
->> +               WARN_ON(r);
->> +       }
+>> + ? ? ? if (omap_device_is_valid(odev)) {
+>> + ? ? ? ? ? ? ? r = omap_device_enable(pdev);
+>> + ? ? ? ? ? ? ? WARN_ON(r);
+>> + ? ? ? }
 >> +
->> +       if (dev->driver->pm && dev->driver->pm->runtime_resume)
->> +               ret = dev->driver->pm->runtime_resume(dev);
+>> + ? ? ? if (dev->driver->pm && dev->driver->pm->runtime_resume)
+>> + ? ? ? ? ? ? ? ret = dev->driver->pm->runtime_resume(dev);
 >> +
->> +       return ret;
+>> + ? ? ? return ret;
 >> +};
 >> +
 >> +int platform_pm_runtime_idle(struct device *dev)
 >> +{
->> +       int ret;
+>> + ? ? ? int ret;
 >> +
->> +       ret = pm_runtime_suspend(dev);
->> +       dev_dbg(dev, "%s [%d]\n", __func__, ret);
+>> + ? ? ? ret = pm_runtime_suspend(dev);
+>> + ? ? ? dev_dbg(dev, "%s [%d]\n", __func__, ret);
 >> +
->> +       return 0;
+>> + ? ? ? return 0;
 >> +};
 >> +#endif /* CONFIG_PM_RUNTIME */
 >> +
@@ -221,10 +221,6 @@ Kevin
 >>
 >> _______________________________________________
 >> 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
 >>
---
-To unsubscribe from this list: send the line "unsubscribe linux-omap" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/a/content_digest b/N1/content_digest
index 0d55f59..afc9024 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,14 +1,10 @@
  "ref\01277422991-25350-1-git-send-email-khilman@deeprootsystems.com\0"
  "ref\01277422991-25350-2-git-send-email-khilman@deeprootsystems.com\0"
  "ref\0AANLkTim4p54brsmph6oaKfoEZwO1GOGfgRNV9vJykOjl@mail.gmail.com\0"
- "From\0Kevin Hilman <khilman@deeprootsystems.com>\0"
- "Subject\0Re: [PATCH v2 1/3] OMAP: PM: initial runtime PM core support\0"
+ "From\0khilman@deeprootsystems.com (Kevin Hilman)\0"
+ "Subject\0[PATCH v2 1/3] OMAP: PM: initial runtime PM core support\0"
  "Date\0Fri, 25 Jun 2010 11:04:48 -0700\0"
- "To\0Grant Likely <grant.likely@secretlab.ca>\0"
- "Cc\0linux-omap@vger.kernel.org"
-  linux-arm-kernel@lists.infradead.org
-  Eric Miao <eric.miao@canonical.com>
- " Nicolas Pitre <nico@fluxnic.net>\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Grant Likely <grant.likely@secretlab.ca> writes:\n"
@@ -16,7 +12,7 @@
  "> On Thu, Jun 24, 2010 at 5:43 PM, Kevin Hilman\n"
  "> <khilman@deeprootsystems.com> wrote:\n"
  ">> Implement the new runtime PM framework as a thin layer on top of the\n"
- ">> omap_device API. \302\240Since we don't have an OMAP-specific bus, override\n"
+ ">> omap_device API. ?Since we don't have an OMAP-specific bus, override\n"
  ">> the runtime PM hooks for the platform_bus for the OMAP specific\n"
  ">> implementation.\n"
  ">>\n"
@@ -124,34 +120,34 @@
  ">>\n"
  ">> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>\n"
  ">> ---\n"
- ">> \302\240arch/arm/mach-omap2/Makefile | \302\240 \302\2407 +++-\n"
- ">> \302\240arch/arm/mach-omap2/pm_bus.c | \302\240 70 ++++++++++++++++++++++++++++++++++++++++++\n"
- ">> \302\2402 files changed, 76 insertions(+), 1 deletions(-)\n"
- ">> \302\240create mode 100644 arch/arm/mach-omap2/pm_bus.c\n"
+ ">> ?arch/arm/mach-omap2/Makefile | ? ?7 +++-\n"
+ ">> ?arch/arm/mach-omap2/pm_bus.c | ? 70 ++++++++++++++++++++++++++++++++++++++++++\n"
+ ">> ?2 files changed, 76 insertions(+), 1 deletions(-)\n"
+ ">> ?create mode 100644 arch/arm/mach-omap2/pm_bus.c\n"
  ">>\n"
  ">> diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile\n"
  ">> index ea52b03..8ed47ea 100644\n"
  ">> --- a/arch/arm/mach-omap2/Makefile\n"
  ">> +++ b/arch/arm/mach-omap2/Makefile\n"
- ">> @@ -46,12 +46,17 @@ obj-$(CONFIG_ARCH_OMAP2) \302\240 \302\240 \302\240 \302\240 \302\240 \302\240+= sdrc2xxx.o\n"
- ">> \302\240ifeq ($(CONFIG_PM),y)\n"
- ">> \302\240obj-$(CONFIG_ARCH_OMAP2) \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 += pm24xx.o\n"
- ">> \302\240obj-$(CONFIG_ARCH_OMAP2) \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 += sleep24xx.o\n"
- ">> -obj-$(CONFIG_ARCH_OMAP3) \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 += pm34xx.o sleep34xx.o cpuidle34xx.o\n"
- ">> +obj-$(CONFIG_ARCH_OMAP3) \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 += pm34xx.o sleep34xx.o cpuidle34xx.o \\\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 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240pm_bus.o\n"
- ">> \302\240obj-$(CONFIG_PM_DEBUG) \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 += pm-debug.o\n"
+ ">> @@ -46,12 +46,17 @@ obj-$(CONFIG_ARCH_OMAP2) ? ? ? ? ? ?+= sdrc2xxx.o\n"
+ ">> ?ifeq ($(CONFIG_PM),y)\n"
+ ">> ?obj-$(CONFIG_ARCH_OMAP2) ? ? ? ? ? ? ? += pm24xx.o\n"
+ ">> ?obj-$(CONFIG_ARCH_OMAP2) ? ? ? ? ? ? ? += sleep24xx.o\n"
+ ">> -obj-$(CONFIG_ARCH_OMAP3) ? ? ? ? ? ? ? += pm34xx.o sleep34xx.o cpuidle34xx.o\n"
+ ">> +obj-$(CONFIG_ARCH_OMAP3) ? ? ? ? ? ? ? += pm34xx.o sleep34xx.o cpuidle34xx.o \\\n"
+ ">> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?pm_bus.o\n"
+ ">> ?obj-$(CONFIG_PM_DEBUG) ? ? ? ? ? ? ? ? += pm-debug.o\n"
  ">>\n"
- ">> \302\240AFLAGS_sleep24xx.o \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 :=-Wa,-march=armv6\n"
- ">> \302\240AFLAGS_sleep34xx.o \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 :=-Wa,-march=armv7-a\n"
+ ">> ?AFLAGS_sleep24xx.o ? ? ? ? ? ? ? ? ? ? :=-Wa,-march=armv6\n"
+ ">> ?AFLAGS_sleep34xx.o ? ? ? ? ? ? ? ? ? ? :=-Wa,-march=armv7-a\n"
  ">>\n"
  ">> +ifeq ($(CONFIG_PM_VERBOSE),y)\n"
- ">> +CFLAGS_pm_bus.o \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 \302\240 \302\240 \302\240+= -DDEBUG\n"
+ ">> +CFLAGS_pm_bus.o ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?+= -DDEBUG\n"
  ">> +endif\n"
  ">> +\n"
- ">> \302\240endif\n"
+ ">> ?endif\n"
  ">>\n"
- ">> \302\240# PRCM\n"
+ ">> ?# PRCM\n"
  ">> diff --git a/arch/arm/mach-omap2/pm_bus.c b/arch/arm/mach-omap2/pm_bus.c\n"
  ">> new file mode 100644\n"
  ">> index 0000000..9719a9f\n"
@@ -182,49 +178,49 @@
  ">> +#ifdef CONFIG_PM_RUNTIME\n"
  ">> +int platform_pm_runtime_suspend(struct device *dev)\n"
  ">> +{\n"
- ">> + \302\240 \302\240 \302\240 struct platform_device *pdev = to_platform_device(dev);\n"
- ">> + \302\240 \302\240 \302\240 struct omap_device *odev = to_omap_device(pdev);\n"
- ">> + \302\240 \302\240 \302\240 int r, ret = 0;\n"
+ ">> + ? ? ? struct platform_device *pdev = to_platform_device(dev);\n"
+ ">> + ? ? ? struct omap_device *odev = to_omap_device(pdev);\n"
+ ">> + ? ? ? int r, ret = 0;\n"
  ">> +\n"
- ">> + \302\240 \302\240 \302\240 dev_dbg(dev, \"%s\\n\", __func__);\n"
+ ">> + ? ? ? dev_dbg(dev, \"%s\\n\", __func__);\n"
  ">> +\n"
- ">> + \302\240 \302\240 \302\240 if (dev->driver->pm && dev->driver->pm->runtime_suspend)\n"
- ">> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 ret = dev->driver->pm->runtime_suspend(dev);\n"
- ">> + \302\240 \302\240 \302\240 if (!ret && omap_device_is_valid(odev)) {\n"
- ">> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 r = omap_device_idle(pdev);\n"
- ">> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 WARN_ON(r);\n"
- ">> + \302\240 \302\240 \302\240 }\n"
+ ">> + ? ? ? if (dev->driver->pm && dev->driver->pm->runtime_suspend)\n"
+ ">> + ? ? ? ? ? ? ? ret = dev->driver->pm->runtime_suspend(dev);\n"
+ ">> + ? ? ? if (!ret && omap_device_is_valid(odev)) {\n"
+ ">> + ? ? ? ? ? ? ? r = omap_device_idle(pdev);\n"
+ ">> + ? ? ? ? ? ? ? WARN_ON(r);\n"
+ ">> + ? ? ? }\n"
  ">> +\n"
- ">> + \302\240 \302\240 \302\240 return ret;\n"
+ ">> + ? ? ? return ret;\n"
  ">> +};\n"
  ">> +\n"
  ">> +int platform_pm_runtime_resume(struct device *dev)\n"
  ">> +{\n"
- ">> + \302\240 \302\240 \302\240 struct platform_device *pdev = to_platform_device(dev);\n"
- ">> + \302\240 \302\240 \302\240 struct omap_device *odev = to_omap_device(pdev);\n"
- ">> + \302\240 \302\240 \302\240 int r, ret = 0;\n"
+ ">> + ? ? ? struct platform_device *pdev = to_platform_device(dev);\n"
+ ">> + ? ? ? struct omap_device *odev = to_omap_device(pdev);\n"
+ ">> + ? ? ? int r, ret = 0;\n"
  ">> +\n"
- ">> + \302\240 \302\240 \302\240 dev_dbg(dev, \"%s\\n\", __func__);\n"
+ ">> + ? ? ? dev_dbg(dev, \"%s\\n\", __func__);\n"
  ">> +\n"
- ">> + \302\240 \302\240 \302\240 if (omap_device_is_valid(odev)) {\n"
- ">> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 r = omap_device_enable(pdev);\n"
- ">> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 WARN_ON(r);\n"
- ">> + \302\240 \302\240 \302\240 }\n"
+ ">> + ? ? ? if (omap_device_is_valid(odev)) {\n"
+ ">> + ? ? ? ? ? ? ? r = omap_device_enable(pdev);\n"
+ ">> + ? ? ? ? ? ? ? WARN_ON(r);\n"
+ ">> + ? ? ? }\n"
  ">> +\n"
- ">> + \302\240 \302\240 \302\240 if (dev->driver->pm && dev->driver->pm->runtime_resume)\n"
- ">> + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 ret = dev->driver->pm->runtime_resume(dev);\n"
+ ">> + ? ? ? if (dev->driver->pm && dev->driver->pm->runtime_resume)\n"
+ ">> + ? ? ? ? ? ? ? ret = dev->driver->pm->runtime_resume(dev);\n"
  ">> +\n"
- ">> + \302\240 \302\240 \302\240 return ret;\n"
+ ">> + ? ? ? return ret;\n"
  ">> +};\n"
  ">> +\n"
  ">> +int platform_pm_runtime_idle(struct device *dev)\n"
  ">> +{\n"
- ">> + \302\240 \302\240 \302\240 int ret;\n"
+ ">> + ? ? ? int ret;\n"
  ">> +\n"
- ">> + \302\240 \302\240 \302\240 ret = pm_runtime_suspend(dev);\n"
- ">> + \302\240 \302\240 \302\240 dev_dbg(dev, \"%s [%d]\\n\", __func__, ret);\n"
+ ">> + ? ? ? ret = pm_runtime_suspend(dev);\n"
+ ">> + ? ? ? dev_dbg(dev, \"%s [%d]\\n\", __func__, ret);\n"
  ">> +\n"
- ">> + \302\240 \302\240 \302\240 return 0;\n"
+ ">> + ? ? ? return 0;\n"
  ">> +};\n"
  ">> +#endif /* CONFIG_PM_RUNTIME */\n"
  ">> +\n"
@@ -234,12 +230,8 @@
  ">>\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"
- "To unsubscribe from this list: send the line \"unsubscribe linux-omap\" in\n"
- "the body of a message to majordomo@vger.kernel.org\n"
- More majordomo info at  http://vger.kernel.org/majordomo-info.html
+ >>
 
-ff633937e053eb9fb64ee5150c5dd3d5ba207848f269268f7211af3f8daf3b48
+fa629173843e3476ea10fcabf35b32118f0166187eee81ceaf7fa465a4e3aeb6
