aboutsummaryrefslogtreecommitdiff
path: root/50316b4218af5b6fbe68a6478613b42258c1b491
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-11-02 00:54:49 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-11-02 00:54:49 +0100
commit1ab68460b1d0671968b35e04f21efcf1ce051916 (patch)
tree6194aafcc1505556c037abc08645923406149cea /50316b4218af5b6fbe68a6478613b42258c1b491
parent394f7164e65a734f815543d918c7bdc0587593a6 (diff)
parentfa743d96e76c3c74aa379ba828f10119b87ff88c (diff)
parenta61756165116563064ab94183713509b546c428b (diff)
parent89e7b2553ae182a4b2a19e2e99a59ad0d3ccb1ed (diff)
downloadlinux-1ab68460b1d0671968b35e04f21efcf1ce051916.tar.gz
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