summaryrefslogtreecommitdiff
path: root/drivers/base/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-03-06 03:29:31 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-03-06 03:29:31 +0300
commite178e7d6df38dab67f51df4282927c4c7392879f (patch)
treefe77ab4e3815f73ae92dc535a2fba0640bb0594e /drivers/base/power
parent1e3e770cfb2b0f63a15bf8bcd31ad8eed2e76f0d (diff)
parent66a5ca4b2c62c44692316f27b0fa39a037cce295 (diff)
parent5877b4f4677b66f92b5ed94491d69680d6eac4dc (diff)
downloadlinux-e178e7d6df38dab67f51df4282927c4c7392879f.tar.xz
Merge branches 'pm-domains' and 'pm-cpufreq'
* pm-domains: PM / Domains: cleanup: rename gpd -> genpd in debugfs interface * pm-cpufreq: cpufreq: ppc: Add missing #include <asm/smp.h>