diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-10 16:07:10 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-10 16:07:10 +0100 |
| commit | 2f8c42f31c9352c9ab9e70616342d585d3c2b735 (patch) | |
| tree | c1a81dbd29c64a077bf3832d9b80fb19dd242c1c /drivers/ata/sata_sis.c | |
| parent | Merge branch 'acpi-resources' (diff) | |
| parent | PCI / PM: Avoid resuming PCI devices during system suspend (diff) | |
| parent | Merge branch 'cpuidle/3.20' of http://git.linaro.org/people/daniel.lezcano/li... (diff) | |
| download | linux-2f8c42f31c9352c9ab9e70616342d585d3c2b735.tar.xz linux-2f8c42f31c9352c9ab9e70616342d585d3c2b735.zip | |
Merge branches 'pm-pci' and 'pm-cpuidle'
* pm-pci:
PCI / PM: Avoid resuming PCI devices during system suspend
* pm-cpuidle:
drivers: cpuidle: Don't initialize big.LITTLE driver if MCPM is unavailable