Merge branch 'acpi-apple'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 5 Oct 2014 20:24:19 +0000 (22:24 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 5 Oct 2014 20:24:19 +0000 (22:24 +0200)
commit939558f2a4b7851c11ce8d08387730914a1e1f5f
tree4013f9577fe56da1fd3f8cc49b0de790b0e85c4f
parent65e8627aad0b9ef24d282296f4d3a1638a2438e6
parent5159e39bdf119613adc6556901ae2d2e5e027551
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