summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-09-03 23:54:29 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-09-03 23:54:29 +0200
commit940c8df63a534e004a5828182712ecf0036c26f7 (patch)
tree4fb744d2db25a22d932aec2909b144aa1fe48c37
parent01d2f105a428bb2ebc248e71b8c86df569288b95 (diff)
parent1f59ab2783aed04f1318b840950801e38b2bebdf (diff)
parent82d2b610586763f21f8f6e1f8c163c1f14b94e1c (diff)
parent03c3876f2e3b4c79ced7d1d227e5a7fe645ed666 (diff)
parent19dc7134805fdf8977c5b44a95cb5a55f832da35 (diff)
downloadlinux-940c8df63a534e004a5828182712ecf0036c26f7.tar.bz2
Merge branches 'acpi-video', 'acpi-battery', 'acpi-spcr' and 'acpi-misc'
* acpi-video: ACPI / video: Add force_none quirk for Dell OptiPlex 9020M * acpi-battery: ACPI: make device_attribute const * acpi-spcr: ACPI: SPCR: work around clock issue on xgene UART ACPI: SPCR: extend XGENE 8250 workaround to m400 * acpi-misc: ACPI / dock: constify attribute_group structure MAINTAINERS: Add Tony and Boris as ACPI/APEI reviewers ACPI / lpat: Fix typos in comments and kerneldoc style MAINTAINERS: device property: ACPI: add fwnode.h