diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-03-21 00:39:12 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-03-21 00:39:12 +0100 |
| commit | 9c86286a60b28bd25cb1c70eb2aba34f182d1063 (patch) | |
| tree | 56b363a6fdbb9b946942cb32336f7dcfef5eb14d /drivers | |
| parent | a01b8605cbcdb43639dac63ba185978085e693a8 (diff) | |
| parent | d474a4d365aaa5c7aabcf11a74ea43aa23f6f2e9 (diff) | |
| parent | 886016835a87757839baced91a7ff09e9636b6b1 (diff) | |
| parent | 9e8ce4b96b781b003e3174fbbc62e1d4388c8b8f (diff) | |
| download | linux-9c86286a60b28bd25cb1c70eb2aba34f182d1063.tar.bz2 | |
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"