summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-03-14 14:22:22 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-03-14 14:22:22 +0100
commit93dffd03b33a085106e2397297fe2064a73e5d57 (patch)
tree93773c8afcac3271794087c263710c22079048a8 /kernel
parent4ed39004271280d2b5fc6929b2782c0e330f6895 (diff)
parent3b99669b75db04e411bb298591224a9e8e4f57fb (diff)
parent22e09b333f0b395b3eb6ab6efa4b3284e2c06810 (diff)
parent41795a8a3cff8e4ba54236ca16c3814ba9cd7f39 (diff)
downloadlinux-93dffd03b33a085106e2397297fe2064a73e5d57.tar.gz
linux-93dffd03b33a085106e2397297fe2064a73e5d57.tar.bz2
linux-93dffd03b33a085106e2397297fe2064a73e5d57.zip
Merge branches 'pm-cpuidle', 'pm-sleep' and 'pm-domains'
* pm-cpuidle: cpuidle: menu: help gcc generate slightly better code cpuidle: menu: avoid expensive square root computation * pm-sleep: PM / suspend: replacing printk PM/freezer: y2038, use boottime to compare tstamps PM / sleep: declare __tracedata symbols as char[] rather than char * pm-domains: PM / Domains: Fix potential NULL pointer dereference PM / Domains: Fix removal of a subdomain PM / Domains: Propagate start and restore errors during runtime resume PM / Domains: Join state name and index in debugfs output PM / Domains: Restore alignment of slaves in debugfs output PM / Domains: remove old power on/off latencies ARM: imx6: pm: declare pm domain latency on power_state struct PM / Domains: Support for multiple states