From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 30 Sep 2013 18:31:29 +0000 (+0200)
Subject: Merge branch 'acpi-conversion-next' into linux-next
X-Git-Tag: next-20131021~77^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=96a9f7166a44b923d3e6f839de6f07e662fbe710;p=karo-tx-linux.git

Merge branch 'acpi-conversion-next' into linux-next

* acpi-conversion-next:
  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
---

96a9f7166a44b923d3e6f839de6f07e662fbe710