From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 20 Mar 2014 12:21:44 +0000 (+0100)
Subject: Merge branches 'acpi-battery' and 'acpi-video'
X-Git-Tag: v3.15-rc1~151^2~8
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=94a81caca3757a2eda026cbd592db8e321fcba43;p=linux.git

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
---

94a81caca3757a2eda026cbd592db8e321fcba43