diff for duplicates of <201111070106.52411.rjw@sisk.pl> diff --git a/a/1.txt b/N1/1.txt index 62b5a70..6fd3cbc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,7 +21,8 @@ Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> 3 files changed, 41 insertions(+), 39 deletions(-) Index: linux/include/linux/pm_domain.h -=================================--- linux.orig/include/linux/pm_domain.h +=================================================================== +--- linux.orig/include/linux/pm_domain.h +++ linux/include/linux/pm_domain.h @@ -23,6 +23,12 @@ struct dev_power_governor { bool (*power_down_ok)(struct dev_pm_domain *domain); @@ -60,7 +61,8 @@ Index: linux/include/linux/pm_domain.h struct pm_domain_data base; struct gpd_dev_ops ops; Index: linux/drivers/base/power/domain.c -=================================--- linux.orig/drivers/base/power/domain.c +=================================================================== +--- linux.orig/drivers/base/power/domain.c +++ linux/drivers/base/power/domain.c @@ -16,6 +16,22 @@ #include <linux/sched.h> @@ -163,7 +165,8 @@ Index: linux/drivers/base/power/domain.c genpd_stop_dev(genpd, dev); Index: linux/arch/arm/mach-shmobile/pm-sh7372.c -=================================--- linux.orig/arch/arm/mach-shmobile/pm-sh7372.c +=================================================================== +--- linux.orig/arch/arm/mach-shmobile/pm-sh7372.c +++ linux/arch/arm/mach-shmobile/pm-sh7372.c @@ -151,7 +151,10 @@ static void sh7372_a4r_suspend(void) diff --git a/a/content_digest b/N1/content_digest index 45bb07a..bbd103c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0201111070101.33960.rjw@sisk.pl\0" "From\0Rafael J. Wysocki <rjw@sisk.pl>\0" "Subject\0[PATCH 2/7] PM / Domains: Make it possible to use per-device .active_wakeup()\0" - "Date\0Mon, 07 Nov 2011 00:06:52 +0000\0" + "Date\0Mon, 7 Nov 2011 01:06:52 +0100\0" "To\0Linux PM list <linux-pm@vger.kernel.org>\0" "Cc\0LKML <linux-kernel@vger.kernel.org>" Linux-sh list <linux-sh@vger.kernel.org> @@ -34,7 +34,8 @@ " 3 files changed, 41 insertions(+), 39 deletions(-)\n" "\n" "Index: linux/include/linux/pm_domain.h\n" - "=================================--- linux.orig/include/linux/pm_domain.h\n" + "===================================================================\n" + "--- linux.orig/include/linux/pm_domain.h\n" "+++ linux/include/linux/pm_domain.h\n" "@@ -23,6 +23,12 @@ struct dev_power_governor {\n" " \tbool (*power_down_ok)(struct dev_pm_domain *domain);\n" @@ -73,7 +74,8 @@ " \tstruct pm_domain_data base;\n" " \tstruct gpd_dev_ops ops;\n" "Index: linux/drivers/base/power/domain.c\n" - "=================================--- linux.orig/drivers/base/power/domain.c\n" + "===================================================================\n" + "--- linux.orig/drivers/base/power/domain.c\n" "+++ linux/drivers/base/power/domain.c\n" "@@ -16,6 +16,22 @@\n" " #include <linux/sched.h>\n" @@ -176,7 +178,8 @@ " \n" " \tgenpd_stop_dev(genpd, dev);\n" "Index: linux/arch/arm/mach-shmobile/pm-sh7372.c\n" - "=================================--- linux.orig/arch/arm/mach-shmobile/pm-sh7372.c\n" + "===================================================================\n" + "--- linux.orig/arch/arm/mach-shmobile/pm-sh7372.c\n" "+++ linux/arch/arm/mach-shmobile/pm-sh7372.c\n" "@@ -151,7 +151,10 @@ static void sh7372_a4r_suspend(void)\n" " \n" @@ -205,4 +208,4 @@ " \tgenpd->power_on = pd_power_up;\n" " \tgenpd->power_on(&sh7372_pd->genpd);" -d837224280bc1e2444f3d4259574e8189c91b26b1d8ae1583245dd46e19f2e84 +a1e15333cf36edcea350e756f53b95e87302cfeee1f9e1b76b0e20ecf011301f
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.