| commit | 8495e9c4a9616c9d19f23182d0536485902259db | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 24 Aug 2013 18:34:33 +0000 (24 11:34 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 24 Aug 2013 18:34:33 +0000 (24 11:34 -0700) | ||
| tree | eabc6c076c16877566868f2f23770f02e783faff | treesnapshot (tar.gz zip) |
| parent | 5befb98b30cce19bdf2221ea48c39f1fec5c4568 | commitdiff |
| parent | 168cf0eca45b86014b8c2a17fcb0673ab1af809b | commitdiff |
Merge tag 'acpi-3.11-rc7' of git://git./linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki:
"I really hoped that it wouldn't be necessary to change anything in
ACPI at this point, but it turns out that we need to revert one more
ACPI video commit causing trouble.
This reverts a change in the ACPI video driver that caused the ACPI
backlight initialization to be carried out even if acpi_backlight=vendor
is passed in the kernel command line which turns out to break things
at least on one system"
* tag 'acpi-3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
Revert "ACPI / video: Always call acpi_video_init_brightness() on init"
Pull ACPI fix from Rafael Wysocki:
"I really hoped that it wouldn't be necessary to change anything in
ACPI at this point, but it turns out that we need to revert one more
ACPI video commit causing trouble.
This reverts a change in the ACPI video driver that caused the ACPI
backlight initialization to be carried out even if acpi_backlight=vendor
is passed in the kernel command line which turns out to break things
at least on one system"
* tag 'acpi-3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
Revert "ACPI / video: Always call acpi_video_init_brightness() on init"