git.stricted.de - GitHub/MotorolaMobilityLLC/kernel-slsi.git/commit

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

author	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Thu, 20 Mar 2014 12:21:44 +0000 (13:21 +0100)
committer	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Thu, 20 Mar 2014 12:21:44 +0000 (13:21 +0100)
commit	94a81caca3757a2eda026cbd592db8e321fcba43
tree	75e04295d0c42b8ac06b9136622eb24b608b9ffb	tree \| snapshot (tar.gz zip)
parent	e25c5abf4125526d62417f8b5a314e743eefe900	commit \| diff
parent	4eee4f03ce7aea1ef212bb5c27a8b54d73315996	commit \| diff
parent	f167a64e9d67ebd03d304e369c12011cf2bffaf5	commit \| diff