summaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-04-02 10:59:01 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-04-02 10:59:01 +0200
commit49076b2c64a25d21d5d2870dc9caa4aa562b8609 (patch)
tree71e9930523dd54b774a8607d5513454cccd6342c /drivers/mfd
parent81616dfa2d097024ca214689f80332b3cf66ddfc (diff)
parent9251a71db62ca9cc7e7cf364218610b0f018c291 (diff)
parent27664c581866c950f31ac007ea2c63fc6e2b29d5 (diff)
parent95c513ec84f7ff35cd9d8c7ce4a99f770bd82c3b (diff)
parentbbf038618a24d72e2efc19146ef421bb1e1eda1a (diff)
parent7e46b32bd58768b4823e767dc14d88ab59c6902e (diff)
Merge branches 'acpi-osi', 'acpi-scan', 'acpi-tad', 'acpi-video' and 'acpi-misc'
* acpi-osi: ACPI / OSI: Add OEM _OSI strings to disable NVidia RTD3 * acpi-scan: ACPI / scan: Send change uevent with offine environmental data * acpi-tad: ACPI: Add Time and Alarm Device (TAD) driver * acpi-video: ACPI / video: Add quirk to force acpi-video backlight on Samsung 670Z5E * acpi-misc: ACPI / Kconfig: Update ACPI_PROCFS_POWER help text