diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-13 22:30:38 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-13 22:30:38 +0100 |
| commit | 5fb0f7fa7f6e70ac6d8fca07733e55f6dae2969d (patch) | |
| tree | 2b351ea61e4ca14277471192dd6d20849b377597 /fs/locks.c | |
| parent | Merge tag 'stable/for-linus-4.0-rc3-tag' of git://git.kernel.org/pub/scm/linu... (diff) | |
| parent | Merge branch 'pm-tools' (diff) | |
| download | linux-5fb0f7fa7f6e70ac6d8fca07733e55f6dae2969d.tar.xz linux-5fb0f7fa7f6e70ac6d8fca07733e55f6dae2969d.zip | |
Merge tag 'pm+acpi-4.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management and ACPI fixes from Rafael Wysocki:
"Just two fixes, one for an ACPI LPSS driver issue introduced during
the 3.17 cycle and one revert of a recent commit that sort of broke
the cpupower tool.
Specifics:
- Fix an ACPI LPSS (Low-Power Subsystem) driver issue causing the
8250_dw driver to confuse an LPSS clock with another one it is
supposed to handle due to the lack of identification allowing it to
tell those clocks apart (Heikki Krogerus).
- Revert a recent commit that was supposed to improve the usability
of the cpupower tool, but clearly did the opposite (Josh Boyer)"
* tag 'pm+acpi-4.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
Revert "cpupower Makefile change to help run the tool without 'make install'"
ACPI / LPSS: provide con_id for the clkdev
Diffstat (limited to 'fs/locks.c')
0 files changed, 0 insertions, 0 deletions