diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-02-26 15:50:55 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-02-26 15:50:55 +0300 |
| commit | 1711fd9cf92f366d42da29b108746accd807789a (patch) | |
| tree | 1c3ed4fb54f05062dbb36182c89366b3c884c37a /sound | |
| parent | 351228eaa2aa32e5b3f22747246199807488f5f2 (diff) | |
| parent | e249714571db26cdb1ae8df7ed39971bafa041a7 (diff) | |
| download | linux-1711fd9cf92f366d42da29b108746accd807789a.tar.xz | |
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()"
Diffstat (limited to 'sound')
0 files changed, 0 insertions, 0 deletions