diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-20 13:21:44 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-20 13:21:44 +0100 |
commit | 94a81caca3757a2eda026cbd592db8e321fcba43 (patch) | |
tree | 75e04295d0c42b8ac06b9136622eb24b608b9ffb /drivers/video/mx3fb.c | |
parent | e25c5abf4125526d62417f8b5a314e743eefe900 (diff) | |
parent | 4eee4f03ce7aea1ef212bb5c27a8b54d73315996 (diff) | |
parent | f167a64e9d67ebd03d304e369c12011cf2bffaf5 (diff) | |
download | linux-94a81caca3757a2eda026cbd592db8e321fcba43.tar.gz |
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