From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 20 Mar 2015 23:39:12 +0000 (+0100)
Subject: Merge branches 'pm-cpuidle', 'powercap', 'irq-pm' and 'acpi-resources'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9c86286a60b28bd25cb1c70eb2aba34f182d1063;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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

9c86286a60b28bd25cb1c70eb2aba34f182d1063