Merge branches 'pm-domains' and 'pm-cpufreq'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 6 Mar 2015 00:29:31 +0000 (01:29 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 6 Mar 2015 00:29:31 +0000 (01:29 +0100)
commite178e7d6df38dab67f51df4282927c4c7392879f
treefe77ab4e3815f73ae92dc535a2fba0640bb0594e
parent1e3e770cfb2b0f63a15bf8bcd31ad8eed2e76f0d
parent66a5ca4b2c62c44692316f27b0fa39a037cce295
parent5877b4f4677b66f92b5ed94491d69680d6eac4dc
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>