summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-14 12:53:59 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-14 12:53:59 +0200
commit518b4e272d99dcb13699b229ea480bc845c141f6 (patch)
tree71712dd4fbdb1446a4e748120591cc88f687b571 /arch/arm
parent03aecbcd71f2d9b9a3bf422a880a1596fd585880 (diff)
parentea85dbcaec0ff29f2c3f84be4c8a01a94e8bd449 (diff)
parent66776a67f7b1aeb4b0fac83df0a3379ed47af05c (diff)
downloadlinux-518b4e272d99dcb13699b229ea480bc845c141f6.tar.bz2
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