diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-11-02 02:54:49 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-11-02 02:54:49 +0300 |
| commit | 1ab68460b1d0671968b35e04f21efcf1ce051916 (patch) | |
| tree | 6194aafcc1505556c037abc08645923406149cea /arch/arm/mach-imx | |
| parent | 394f7164e65a734f815543d918c7bdc0587593a6 (diff) | |
| parent | fa743d96e76c3c74aa379ba828f10119b87ff88c (diff) | |
| parent | a61756165116563064ab94183713509b546c428b (diff) | |
| parent | 89e7b2553ae182a4b2a19e2e99a59ad0d3ccb1ed (diff) | |
| download | linux-1ab68460b1d0671968b35e04f21efcf1ce051916.tar.xz | |
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