summaryrefslogtreecommitdiffstats
path: root/drivers/bus
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-06-19 01:18:02 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-06-19 01:18:02 +0200
commitab232ba57043ca85b55ffd7125f3f2c2d7e732ec (patch)
tree725ba069e0fe43752766a4bfbfc65c09597f7bf0 /drivers/bus
parent8ced6789da03649d21656dd908c2930a003fffc4 (diff)
parent32e8d689dc12e29fcb6ba9c65a33473d0cbdfec8 (diff)
parent56f487c78015936097474fd89b2ccb229d500d0f (diff)
downloadlinux-ab232ba57043ca85b55ffd7125f3f2c2d7e732ec.tar.gz
linux-ab232ba57043ca85b55ffd7125f3f2c2d7e732ec.tar.bz2
linux-ab232ba57043ca85b55ffd7125f3f2c2d7e732ec.zip
Merge branches 'pm-sleep' and 'pm-runtime'
* pm-sleep: PM / sleep: trace_device_pm_callback coverage in dpm_prepare/complete PM / wakeup: add a dummy wakeup_source to record statistics PM / sleep: Make suspend-to-idle-specific code depend on CONFIG_SUSPEND PM / sleep: Return -EBUSY from suspend_enter() on wakeup detection PM / tick: Add tracepoints for suspend-to-idle diagnostics PM / sleep: Fix symbol name in a comment in kernel/power/main.c leds / PM: fix hibernation on arm when gpio-led used with CPU led trigger ARM: omap-device: use SET_NOIRQ_SYSTEM_SLEEP_PM_OPS bus: omap_l3_noc: add missed callbacks for suspend-to-disk PM / sleep: Add macro to define common noirq system PM callbacks PM / sleep: Refine diagnostic messages in enter_state() PM / wakeup: validate wakeup source before activating it. * pm-runtime: PM / Runtime: Update last_busy in rpm_resume PM / runtime: add note about re-calling in during device probe()