Merge branches 'acpi-fan', 'acpi-video' and 'acpi-ec'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Dec 2014 17:43:16 +0000 (18:43 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Dec 2014 17:43:16 +0000 (18:43 +0100)
commit0a0666428680c4a68d050491d5323a2ef05e08a7
tree8c231099549e3fb6925d7804e4524b44aeb2891b
parentbe10f60d29433f712bf0887431efb80975e64438
parentbbb16fef19122ec9f20fb865c45375e12f85d2a1
parentb4df463678fb9c6dae9548dbb7545993779fd416
parent1741acea75ea51ce709304a26baf72e1e99b8f3a
Merge branches 'acpi-fan', 'acpi-video' and 'acpi-ec'

* acpi-fan:
  ACPI / Fan: Use bus id as the name for non PNP0C0B (Fan) devices

* acpi-video:
  ACPI / video: update the skip case for acpi_video_device_in_dod()

* acpi-ec:
  ACPI / EC: Fix unexpected ec_remove_handlers() invocations