diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-11-02 00:54:49 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-11-02 00:54:49 +0100 |
| commit | 1ab68460b1d0671968b35e04f21efcf1ce051916 (patch) | |
| tree | 6194aafcc1505556c037abc08645923406149cea /drivers/base | |
| parent | Merge branch 'pm-opp' (diff) | |
| parent | PM / AVS: rockchip-io: Fix module autoload for OF platform driver (diff) | |
| parent | PM / clk: Fix broken build due to non-matching code and header #ifdefs (diff) | |
| parent | powercap / RAPL: Enable Broxton RAPL support (diff) | |
| download | linux-dev-1ab68460b1d0671968b35e04f21efcf1ce051916.tar.xz linux-dev-1ab68460b1d0671968b35e04f21efcf1ce051916.zip | |
Merge branches 'pm-avs', 'pm-clk' and 'powercap'
* pm-avs:
PM / AVS: rockchip-io: Fix module autoload for OF platform driver
* pm-clk:
PM / clk: Fix broken build due to non-matching code and header #ifdefs
* powercap:
powercap / RAPL: Enable Broxton RAPL support