summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-08 19:54:45 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-08 19:54:45 +0100
commit5996d93054f240e994a77708b63216545e169ce1 (patch)
tree99b7057f592ca95352a153a03fb1eb55a9cfe90a /drivers/acpi
parent69bad361e69ac0e9f96865f405439e7cbd8c0136 (diff)
parent667ae4ee6c29c7ea261d53d3ecc016026d9c2a9a (diff)
parent491cb357decca2b3eeaac5a8498ad23e7dd073b7 (diff)
Merge branches 'acpi-video' and 'acpi-pmic'
* acpi-video: ACPI / video: Run _BCL before deciding registering backlight * acpi-pmic: ACPI / PMIC: AXP288: support virtual GPIO in ACPI table ACPI / PMIC: support PMIC operation region for XPower AXP288 ACPI / PMIC: support PMIC operation region for CrystalCove iio/axp288_adc: remove THIS_MODULE owner mfd/axp20x: avoid irq numbering collision iio: adc: Add module device table for autoloading iio: adc: Add support for axp288 adc mfd: axp20x: Extend axp20x to support axp288 pmic