summaryrefslogtreecommitdiff
path: root/drivers/acpi/battery.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-06-19 14:40:48 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-06-19 14:40:48 +0200
commitcf8116c491e98b47a535348a50c94cc01770d9a3 (patch)
tree021f648d28f1138429aacda2a3061912a087e55f /drivers/acpi/battery.c
parent12e27b115472ad0f3b142ddf59d3998305984408 (diff)
parent3d915894f8317ac3e55b47da829aa65eb5f9ae97 (diff)
parent92c4d2ad3c85ed6ea2b6260a11df0013706b1462 (diff)
parent765bdd4e51674c1ae3a61ceb12a05706bf6b691b (diff)
parentf43691c61d6e547809bff33394ac83cc263960e4 (diff)
Merge branches 'acpi-general', 'acpi-processor', 'acpi-lpss' and 'acpi-battery'
* acpi-general: ACPI: use kstrto*() instead of simple_strto*() * acpi-processor: ACPI / processor replace __attribute__((packed)) by __packed * acpi-lpss: ACPI / LPSS: Take I2C host controllers out of reset * acpi-battery: ACPI / battery: add quirk for Acer Aspire V5-573G ACPI / battery: use callback for setting up quirks