Merge branches 'pm-devfreq' and 'acpi-pci'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 26 Feb 2016 12:50:55 +0000 (13:50 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 26 Feb 2016 12:50:55 +0000 (13:50 +0100)
commit1711fd9cf92f366d42da29b108746accd807789a
tree1c3ed4fb54f05062dbb36182c89366b3c884c37a
parent351228eaa2aa32e5b3f22747246199807488f5f2
parente249714571db26cdb1ae8df7ed39971bafa041a7
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()"