summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-03-20 13:21:44 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-03-20 13:21:44 +0100
commit94a81caca3757a2eda026cbd592db8e321fcba43 (patch)
tree75e04295d0c42b8ac06b9136622eb24b608b9ffb /drivers/acpi
parente25c5abf4125526d62417f8b5a314e743eefe900 (diff)
parent4eee4f03ce7aea1ef212bb5c27a8b54d73315996 (diff)
parentf167a64e9d67ebd03d304e369c12011cf2bffaf5 (diff)
Merge branches 'acpi-battery' and 'acpi-video'
* acpi-battery: ACPI / AC: recheck adapter status upon battery status changes ACPI / battery: call ACPI notifier chain in acpi_battery_notify ACPI / battery: move some ACPI_BATTERY_* definitions to header * acpi-video: video / output: Drop display output class support fujitsu-laptop: Drop unneeded include acer-wmi: Stop selecting VIDEO_OUTPUT_CONTROL ACPI / gpu / drm: Stop selecting VIDEO_OUTPUT_CONTROL ACPI / video: fix ACPI_VIDEO dependencies