All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <1305098801.4642.6.camel@vence>

diff --git a/a/1.txt b/N1/1.txt
index 87e020a..a67a095 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -73,8 +73,7 @@ multiple states (or levels), with a governor hook for each state.
 >  4 files changed, 525 insertions(+), 2 deletions(-)
 > 
 > Index: linux-2.6/include/linux/pm_domain.h
-> ===================================================================
-> --- /dev/null
+> =================================> --- /dev/null
 > +++ linux-2.6/include/linux/pm_domain.h
 > @@ -0,0 +1,83 @@
 > +/*
@@ -161,8 +160,7 @@ multiple states (or levels), with a governor hook for each state.
 > +
 > +#endif /* _LINUX_PM_DOMAIN_H */
 > Index: linux-2.6/include/linux/pm.h
-> ===================================================================
-> --- linux-2.6.orig/include/linux/pm.h
+> =================================> --- linux-2.6.orig/include/linux/pm.h
 > +++ linux-2.6/include/linux/pm.h
 > @@ -472,7 +472,8 @@ extern void update_pm_runtime_accounting
 >   * subsystem-level and driver-level callbacks.
@@ -175,8 +173,7 @@ multiple states (or levels), with a governor hook for each state.
 >  
 >  /*
 > Index: linux-2.6/drivers/base/power/Makefile
-> ===================================================================
-> --- linux-2.6.orig/drivers/base/power/Makefile
+> =================================> --- linux-2.6.orig/drivers/base/power/Makefile
 > +++ linux-2.6/drivers/base/power/Makefile
 > @@ -1,4 +1,4 @@
 > -obj-$(CONFIG_PM)	+= sysfs.o generic_ops.o
@@ -185,8 +182,7 @@ multiple states (or levels), with a governor hook for each state.
 >  obj-$(CONFIG_PM_RUNTIME)	+= runtime.o
 >  obj-$(CONFIG_PM_TRACE_RTC)	+= trace.o
 > Index: linux-2.6/drivers/base/power/domain.c
-> ===================================================================
-> --- /dev/null
+> =================================> --- /dev/null
 > +++ linux-2.6/drivers/base/power/domain.c
 > @@ -0,0 +1,439 @@
 > +/*
diff --git a/a/content_digest b/N1/content_digest
index 20c5f11..a277a71 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,8 +2,8 @@
  "ref\0201104290154.56145.rjw@sisk.pl\0"
  "ref\0201104300254.46973.rjw@sisk.pl\0"
  "From\0Kevin Hilman <khilman@ti.com>\0"
- "Subject\0Re: [Update][RFC][PATCH 1/2] PM / Runtime: Support for generic I/O power domains (v2)\0"
- "Date\0Wed, 11 May 2011 09:26:41 +0200\0"
+ "Subject\0Re: [Update][RFC][PATCH 1/2] PM / Runtime: Support for generic I/O\0"
+ "Date\0Wed, 11 May 2011 07:26:41 +0000\0"
  "To\0Rafael J. Wysocki <rjw@sisk.pl>\0"
  "Cc\0linux-sh@vger.kernel.org"
   Greg KH <gregkh@suse.de>
@@ -87,8 +87,7 @@
  ">  4 files changed, 525 insertions(+), 2 deletions(-)\n"
  "> \n"
  "> Index: linux-2.6/include/linux/pm_domain.h\n"
- "> ===================================================================\n"
- "> --- /dev/null\n"
+ "> =================================> --- /dev/null\n"
  "> +++ linux-2.6/include/linux/pm_domain.h\n"
  "> @@ -0,0 +1,83 @@\n"
  "> +/*\n"
@@ -175,8 +174,7 @@
  "> +\n"
  "> +#endif /* _LINUX_PM_DOMAIN_H */\n"
  "> Index: linux-2.6/include/linux/pm.h\n"
- "> ===================================================================\n"
- "> --- linux-2.6.orig/include/linux/pm.h\n"
+ "> =================================> --- linux-2.6.orig/include/linux/pm.h\n"
  "> +++ linux-2.6/include/linux/pm.h\n"
  "> @@ -472,7 +472,8 @@ extern void update_pm_runtime_accounting\n"
  ">   * subsystem-level and driver-level callbacks.\n"
@@ -189,8 +187,7 @@
  ">  \n"
  ">  /*\n"
  "> Index: linux-2.6/drivers/base/power/Makefile\n"
- "> ===================================================================\n"
- "> --- linux-2.6.orig/drivers/base/power/Makefile\n"
+ "> =================================> --- linux-2.6.orig/drivers/base/power/Makefile\n"
  "> +++ linux-2.6/drivers/base/power/Makefile\n"
  "> @@ -1,4 +1,4 @@\n"
  "> -obj-$(CONFIG_PM)\t+= sysfs.o generic_ops.o\n"
@@ -199,8 +196,7 @@
  ">  obj-$(CONFIG_PM_RUNTIME)\t+= runtime.o\n"
  ">  obj-$(CONFIG_PM_TRACE_RTC)\t+= trace.o\n"
  "> Index: linux-2.6/drivers/base/power/domain.c\n"
- "> ===================================================================\n"
- "> --- /dev/null\n"
+ "> =================================> --- /dev/null\n"
  "> +++ linux-2.6/drivers/base/power/domain.c\n"
  "> @@ -0,0 +1,439 @@\n"
  "> +/*\n"
@@ -313,4 +309,4 @@
  "\n"
  Kevin
 
-48ff30213b2156ffb5ac6b2cefa1365f2ebd6c2ed6786d70cc4c81a43dd04f47
+1d167f28fe9a44a6678c208a0ab3fa487e3e87638303b9364cc7bbbef66ed27c

diff --git a/a/content_digest b/N2/content_digest
index 20c5f11..12862d6 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -5,11 +5,12 @@
  "Subject\0Re: [Update][RFC][PATCH 1/2] PM / Runtime: Support for generic I/O power domains (v2)\0"
  "Date\0Wed, 11 May 2011 09:26:41 +0200\0"
  "To\0Rafael J. Wysocki <rjw@sisk.pl>\0"
- "Cc\0linux-sh@vger.kernel.org"
+ "Cc\0Linux PM mailing list <linux-pm@lists.linux-foundation.org>"
   Greg KH <gregkh@suse.de>
   LKML <linux-kernel@vger.kernel.org>
   Grant Likely <grant.likely@secretlab.ca>
- " Linux PM mailing list <linux-pm@lists.linux-foundation.org>\0"
+  Magnus Damm <magnus.damm@gmail.com>
+ " linux-sh@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
  "Hi Rafael,\n"
@@ -313,4 +314,4 @@
  "\n"
  Kevin
 
-48ff30213b2156ffb5ac6b2cefa1365f2ebd6c2ed6786d70cc4c81a43dd04f47
+dd119c734a28fbab207796e887ff121be3fb14448b8d4f812b36456a1a168b9d

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.