diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-31 16:42:10 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-31 16:42:10 -0700 |
commit | 6f0928036bcbd8dd2ebee9201580da8bcc0a81af (patch) | |
tree | 53da30ac3b13cfc97803a51b178a6d6dbdb8c76b /fs/cifs/misc.c | |
parent | 7c909b09372d5b064651202bf236b63caddd1777 (diff) | |
parent | b6328a07bd6b3d31b64f85864fe74f3b08c010ca (diff) |
Merge tag 'pm+acpi-3.16-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fix from Rafael Wysocki:
"One commit that fixes a problem causing PNP devices to be associated
with wrong ACPI device objects sometimes during device enumeration due
to an incorrect check in a matching function.
That problem was uncovered by the ACPI device enumeration rework in
3.14"
* tag 'pm+acpi-3.16-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI / PNP: Fix acpi_pnp_match()
Diffstat (limited to 'fs/cifs/misc.c')
0 files changed, 0 insertions, 0 deletions