diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-05 20:24:19 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-05 20:24:19 (GMT) |
| commit | 939558f2a4b7851c11ce8d08387730914a1e1f5f (patch) | |
| tree | 4013f9577fe56da1fd3f8cc49b0de790b0e85c4f /fs | |
| parent | 65e8627aad0b9ef24d282296f4d3a1638a2438e6 (diff) | |
| parent | 5159e39bdf119613adc6556901ae2d2e5e027551 (diff) | |
| download | linux-939558f2a4b7851c11ce8d08387730914a1e1f5f.tar.xz | |
Merge branch 'acpi-apple'
* acpi-apple:
ACPI / SBS: Fix check in acpi_ac_get_present()
ACPI: Support _OSI("Darwin") correctly
ACPI / SBS: Disable smart battery manager on Apple
ACPI / SBS: Don't assume the existence of an SBS charger
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions