]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'pm-domains', 'powercap' and 'pm-tools'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 29 Dec 2014 20:24:00 +0000 (21:24 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 29 Dec 2014 20:24:00 +0000 (21:24 +0100)
commit1777414630a893e55692a28d1ae99e8fc95dae46
tree601f8f765d4bfc78f2c1f16bd8e140f50c618e3e
parentd3d0a10b499d63ea239fcc80549b94a3866eba23
parentde71eb2ded11e192d2427ba6006c20f79a080111
parent69fc90fe5c4b594f9e546e11f1fe9e1a6732f349
parent917f198a267ca2593c9340f197ec8319a8a858dd
Merge branches 'pm-domains', 'powercap' and 'pm-tools'

* pm-domains:
  PM / Domains: Export of_genpd_get_from_provider function

* powercap:
  powercap / RAPL: add IDs for future Xeon CPUs

* pm-tools:
  tools / cpupower: Fix no idle state information return value
  tools / cpupower: Correctly detect if running as root
drivers/base/power/domain.c
include/linux/pm_domain.h