Merge branch 'acpi-conversion'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 28 Oct 2013 00:14:17 +0000 (01:14 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 28 Oct 2013 00:14:17 +0000 (01:14 +0100)
commit31c466c1af229b08bec56c6564b50311d9d660ca
treef24b6d7e181cf31d7ed335ac0d56c80b5f48c631
parent3f66c315f5929d0ad19d8e9d29c8001543aa9be2
parentab0fd674d6cef0904baa511f22613ef6474f8169
Merge branch 'acpi-conversion'

* acpi-conversion:
  ACPI / AC: Remove AC's proc directory.
  ideapad_laptop: convert ideapad device/driver to platform bus
  ideapad_laptop: remove ideapad_handle and ideapad_priv
  ideapad_laptop: convert internal function calls to use ideapad_private as parameter
  ideapad_laptop: introduce struct acpi_device pointer to ideapad_private structure
  ideapad_laptop: introduce #ifdef CONFIG_PM_SLEEP for PM specific code
  ACPI / AC: convert ACPI ac driver to platform bus