From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 14 Apr 2015 10:53:59 +0000 (+0200)
Subject: Merge branches 'powercap' and 'pm-devfreq'
X-Git-Tag: v4.1-rc1~131^2
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=518b4e272d99dcb13699b229ea480bc845c141f6;p=cascardo%2Flinux.git

Merge branches 'powercap' and 'pm-devfreq'

* powercap:
  powercap / RAPL: mark rapl_ids array as __initconst
  powercap / RAPL: add ID for Broadwell server

* pm-devfreq:
  PM / devfreq: tegra: Register governor on module init
  PM / devfreq: tegra: Enable interrupts after resuming the devfreq monitor
  PM / devfreq: tegra: Set drvdata before enabling the irq
  PM / devfreq: tegra: remove operating-points
  PM / devfreq: tegra: Use clock rate constraints
  PM / devfreq: tegra: Update to v5 of the submitted patches
  PM / devfreq: correct misleading comment
  PM / devfreq: event: Add const keyword for devfreq_event_ops structure
---

518b4e272d99dcb13699b229ea480bc845c141f6