| commit | e7394c776f22a8893e157842fe2ded100280a3a1 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 5 Feb 2015 18:57:29 +0000 (5 10:57 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 5 Feb 2015 18:57:29 +0000 (5 10:57 -0800) | ||
| tree | 895132120a58ffb2f683bd62ad877f9cf16b1e26 | treesnapshot (tar.gz zip) |
| parent | f3c2352df1347ffc6f9265476ca475ea70b81656 | commitdiff |
| parent | 3df2da96874402722d760e5d4eb2968737e5bb01 | commitdiff |
Merge tag 'pm+acpi-3.19-fin' of git://git./linux/kernel/git/rafael/linux-pm
Pull ACPI power management fix from Rafael Wysocki:
"This is a revert of an ACPI Low-power Subsystem (LPSS) driver change
that was supposed to improve power management of the LPSS DMA
controller, but introduced more serious problems.
Since fixing them turns out to be non-trivial, it is better to revert
the commit in question at this point and try to fix the original issue
differently in the next cycle"
* tag 'pm+acpi-3.19-fin' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
Revert "ACPI / LPSS: introduce a 'proxy' device to power on LPSS for DMA"
Pull ACPI power management fix from Rafael Wysocki:
"This is a revert of an ACPI Low-power Subsystem (LPSS) driver change
that was supposed to improve power management of the LPSS DMA
controller, but introduced more serious problems.
Since fixing them turns out to be non-trivial, it is better to revert
the commit in question at this point and try to fix the original issue
differently in the next cycle"
* tag 'pm+acpi-3.19-fin' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
Revert "ACPI / LPSS: introduce a 'proxy' device to power on LPSS for DMA"