path: root/fs
diff options
authorLinus Torvalds <>2013-08-24 11:34:33 -0700
committerLinus Torvalds <>2013-08-24 11:34:33 -0700
commit8495e9c4a9616c9d19f23182d0536485902259db (patch)
treeeabc6c076c16877566868f2f23770f02e783faff /fs
parent5befb98b30cce19bdf2221ea48c39f1fec5c4568 (diff)
parent168cf0eca45b86014b8c2a17fcb0673ab1af809b (diff)
Merge tag 'acpi-3.11-rc7' of git://
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:// Revert "ACPI / video: Always call acpi_video_init_brightness() on init"
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions