From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sun, 5 Oct 2014 20:24:19 +0000 (+0200)
Subject: Merge branch 'acpi-apple'
X-Git-Tag: fixes-against-v3.18-rc2~138^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=939558f2a4b7851c11ce8d08387730914a1e1f5f;p=pandora-kernel.git

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
---

939558f2a4b7851c11ce8d08387730914a1e1f5f
Reading git-diff-tree failed