]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
* 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()"


Trivial merge