From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 20 Mar 2014 12:25:54 +0000 (+0100)
Subject: Merge branches 'pm-runtime' and 'pm-sleep'
X-Git-Tag: v3.15-rc1~122^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=36cc86e8ec1a0ab309052bc9b25e48a31288b8a5;p=platform%2Fkernel%2Flinux-exynos.git

Merge branches 'pm-runtime' and 'pm-sleep'

* pm-runtime:
  PM / Runtime: Update runtime_idle() documentation for return value meaning

* pm-sleep:
  PM / sleep: Correct whitespace errors in <linux/pm.h>
  PM: Add missing "freeze" state
  PM / Hibernate: Spelling s/anonymouns/anonymous/
  PM / Runtime: Add missing "it" in comment
  PM / suspend: Remove unnecessary !!
  PCI / PM: Resume runtime-suspended devices later during system suspend
  ACPI / PM: Resume runtime-suspended devices later during system suspend
  PM / sleep: Set pm_generic functions to NULL for !CONFIG_PM_SLEEP
  PM: fix typo in comment
  PM / hibernate: use name_to_dev_t to parse resume
  PM / wakeup: Include appropriate header file in kernel/power/wakelock.c
  PM / sleep: Move prototype declaration to header file kernel/power/power.h
  PM / sleep: Asynchronous threads for suspend_late
  PM / sleep: Asynchronous threads for suspend_noirq
  PM / sleep: Asynchronous threads for resume_early
  PM / sleep: Asynchronous threads for resume_noirq
  PM / sleep: Two flags for async suspend_noirq and suspend_late
---

36cc86e8ec1a0ab309052bc9b25e48a31288b8a5