summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-03-21 00:39:12 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-03-21 00:39:12 +0100
commit9c86286a60b28bd25cb1c70eb2aba34f182d1063 (patch)
tree56b363a6fdbb9b946942cb32336f7dcfef5eb14d
parentMerge branch 'cpuidle/4.0-fixes' of http://git.linaro.org/people/daniel.lezca... (diff)
parentpowercap / RAPL: handle domains with different energy units (diff)
parentrtc: at91rm9200: double locking bug in at91_rtc_interrupt() (diff)
parentRevert "x86/PCI: Refine the way to release PCI IRQ resources" (diff)
downloadlinux-9c86286a60b28bd25cb1c70eb2aba34f182d1063.tar.xz
linux-9c86286a60b28bd25cb1c70eb2aba34f182d1063.zip
Merge branches 'pm-cpuidle', 'powercap', 'irq-pm' and 'acpi-resources'
* pm-cpuidle: cpuidle: mvebu: Update cpuidle thresholds for Armada XP SOCs cpuidle: mvebu: Fix the CPU PM notifier usage * powercap: powercap / RAPL: handle domains with different energy units * irq-pm: rtc: at91rm9200: double locking bug in at91_rtc_interrupt() * acpi-resources: Revert "x86/PCI: Refine the way to release PCI IRQ resources"