]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'acpi-conversion-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 15 Oct 2013 23:43:10 +0000 (01:43 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 15 Oct 2013 23:43:10 +0000 (01:43 +0200)
* acpi-conversion-next:
  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


Trivial merge