diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-28 01:14:17 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-28 01:14:17 +0100 |
| commit | 31c466c1af229b08bec56c6564b50311d9d660ca (patch) | |
| tree | f24b6d7e181cf31d7ed335ac0d56c80b5f48c631 /drivers/nfc | |
| parent | 3f66c315f5929d0ad19d8e9d29c8001543aa9be2 (diff) | |
| parent | ab0fd674d6cef0904baa511f22613ef6474f8169 (diff) | |
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
Diffstat (limited to 'drivers/nfc')
0 files changed, 0 insertions, 0 deletions