]> www.infradead.org Git - linux.git/commitdiff
projects / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e25c5ab 4eee4f0 f167a64)
Merge branches 'acpi-battery' and 'acpi-video'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 20 Mar 2014 12:21:44 +0000 (13:21 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 20 Mar 2014 12:21:44 +0000 (13:21 +0100)
* 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

1  2  3 
drivers/acpi/Kconfig patch | diff1 | diff2 | diff3 | blob | history

diff --cc drivers/acpi/Kconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.