diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-11 21:45:03 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-11 21:45:03 +0300 |
| commit | 7ae9c768e19ec8ce1b397a5c4abf88f9ee053e09 (patch) | |
| tree | de7fdb350bfcfbbe49634a03571b7268ab73e6f8 /arch/arm/mach-omap1/timer.c | |
| parent | 2a62ec0af2ed3758dd4535eb58527f63ba6549ad (diff) | |
| parent | 5b3e7e0536bd6326798ab57d14a49b15ad7e3e3f (diff) | |
| download | linux-7ae9c768e19ec8ce1b397a5c4abf88f9ee053e09.tar.xz | |
Merge tag 'pm+acpi-4.5-final' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management and ACPI fixes from Rafael Wysocki:
"Two more fixes for issues introduced recently, one in the generic
device properties framework and one in ACPICA.
Specifics:
- Revert a recent ACPICA commit that has been reverted upstream,
because it caused problems to happen on user systems and the
problem it attempted to address will not be relevant any more after
upcoming ACPI specification changes (Bob Moore).
- Fix crash in the generic device properties framework introduced by
a recent change that forgot to check pointers against error values
in addition to checking them against NULL (Heikki Krogerus)"
* tag 'pm+acpi-4.5-final' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
device property: fwnode->secondary may contain ERR_PTR(-ENODEV)
ACPICA: Revert "Parser: Fix for SuperName method invocation"
Diffstat (limited to 'arch/arm/mach-omap1/timer.c')
0 files changed, 0 insertions, 0 deletions