From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 26 Feb 2016 12:50:55 +0000 (+0100)
Subject: Merge branches 'pm-devfreq' and 'acpi-pci'
X-Git-Url: http://git.efficios.com/?p=deliverable%2Flinux.git;a=commitdiff_plain;h=1711fd9cf92f366d42da29b108746accd807789a

Merge branches 'pm-devfreq' and 'acpi-pci'

* pm-devfreq:
  PM / devfreq: tegra: Set freq in rate callback

* acpi-pci:
  Revert "ACPI, PCI, irq: remove interrupt count restriction"
  Revert "ACPI / PCI: Simplify acpi_penalize_isa_irq()"
---

1711fd9cf92f366d42da29b108746accd807789a