]> Git Repo - linux.git/commitdiff
Merge branches 'pm-avs', 'pm-clk' and 'powercap'
authorRafael J. Wysocki <[email protected]>
Sun, 1 Nov 2015 23:54:49 +0000 (00:54 +0100)
committerRafael J. Wysocki <[email protected]>
Sun, 1 Nov 2015 23:54:49 +0000 (00:54 +0100)
* 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


Trivial merge
This page took 0.060115 seconds and 4 git commands to generate.