diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-05 02:48:13 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-05 02:48:13 +0100 |
commit | 56c67ce187a899f76c5f22dd30fd9cfc3d95a0c2 (patch) | |
tree | ded4c39fa3e405512e78988e8a3dff16405d9897 /drivers/net/xen-netfront.c | |
parent | Merge tag 'media/v3.18-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
parent | ACPI / video: update condition to check if device is in _DOD list (diff) | |
download | linux-56c67ce187a899f76c5f22dd30fd9cfc3d95a0c2.tar.xz linux-56c67ce187a899f76c5f22dd30fd9cfc3d95a0c2.zip |
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/net/xen-netfront.c')
0 files changed, 0 insertions, 0 deletions