diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-05 04:48:13 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-05 04:48:13 +0300 |
commit | 56c67ce187a899f76c5f22dd30fd9cfc3d95a0c2 (patch) | |
tree | ded4c39fa3e405512e78988e8a3dff16405d9897 /drivers/watchdog/s3c2410_wdt.c | |
parent | ebea76f5b95caddb59f49a3e288da26358e6ab1f (diff) | |
parent | 35d0565b95547ec12d025dc9b1394f22968d113d (diff) | |
download | linux-56c67ce187a899f76c5f22dd30fd9cfc3d95a0c2.tar.xz |
Merge tag 'pm+acpi-3.18-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI backlight fix from Rafael Wysocki:
"This is a simple fix for an ACPI backlight regression introduced by a
recent commit that overlooked a corner case which should have been
taken into account"
* tag 'pm+acpi-3.18-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI / video: update condition to check if device is in _DOD list
Diffstat (limited to 'drivers/watchdog/s3c2410_wdt.c')
0 files changed, 0 insertions, 0 deletions