From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sun, 1 Nov 2015 23:54:49 +0000 (+0100)
Subject: Merge branches 'pm-avs', 'pm-clk' and 'powercap'
X-Git-Tag: firefly_0821_release~176^2~812^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1ab68460b1d0671968b35e04f21efcf1ce051916;p=firefly-linux-kernel-4.4.55.git

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
---

1ab68460b1d0671968b35e04f21efcf1ce051916