diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-13 13:09:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-13 13:09:50 -0700 |
| commit | 25e33ed9c711c8d64c403a17d4a2cdeac213800b (patch) | |
| tree | 57d6b07a8499d24a5c0909d8745bbfeca9f71112 /fs/btrfs/inode.c | |
| parent | cb03dc094ad4bfb8223d02b28e2374c51e4c31fb (diff) | |
| parent | 8c9b7a7b2fc2750af418ddc28e707c42e78aa0bf (diff) | |
| download | linux-25e33ed9c711c8d64c403a17d4a2cdeac213800b.tar.bz2 | |
Merge tag 'acpi-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki:
"This is an alternative fix for the regression introduced in 3.9 whose
previous fix had to be reverted right before 3.10-rc5, because it
broke one of the Tony's machines.
In this one the check is confined to the ACPI video driver (which is
the only one causing the problem to happen in the first place) and the
Tony's box shouldn't even notice it.
- ACPI fix for an issue causing ACPI video driver to attempt to bind
to devices it shouldn't touch from Rafael J Wysocki."
* tag 'acpi-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI / video: Do not bind to device objects with a scan handler
Diffstat (limited to 'fs/btrfs/inode.c')
0 files changed, 0 insertions, 0 deletions