From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 6 Mar 2015 00:29:31 +0000 (+0100)
Subject: Merge branches 'pm-domains' and 'pm-cpufreq'
X-Git-Tag: v4.0-rc3~15^2
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=e178e7d6df38dab67f51df4282927c4c7392879f;p=cascardo%2Flinux.git

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>
---

e178e7d6df38dab67f51df4282927c4c7392879f