diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-05-23 12:33:44 +0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-05-23 12:33:44 +0400 |
commit | f1a0b8310c99a0e3d579e61d81870caec058db46 (patch) | |
tree | 6bfe155bb1f67c0c798428c93520eca8973738cf /net/bluetooth/a2mp.c | |
parent | c7788792a5e7b0d5d7f96d0766b4cb6112d47d75 (diff) | |
parent | c8f6d8351ba8c89d5cd4c562552ec7ec29274e31 (diff) | |
download | linux-f1a0b8310c99a0e3d579e61d81870caec058db46.tar.xz |
Merge branch 'acpi-fixes'
* acpi-fixes:
ACPI / video: Add "Asus UL30A" to ACPI video detect blacklist
ACPI / PM: Allow device power states to be used for CONFIG_PM unset
Diffstat (limited to 'net/bluetooth/a2mp.c')
0 files changed, 0 insertions, 0 deletions