diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-01 22:10:15 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-01 22:10:15 +0200 |
| commit | 7b5c39389c86063e86fe8f2e0093c7197ddfa60a (patch) | |
| tree | 550d98402980ee5a311b2990262404d2d49bed44 /drivers/base | |
| parent | 797cb8a6f7f1244ddd1e4bebebe38786d667057f (diff) | |
| parent | 9accff57e050d35f6c84554005b0e7caf0429b19 (diff) | |
| download | linux-7b5c39389c86063e86fe8f2e0093c7197ddfa60a.tar.bz2 | |
Merge branch 'pm-runtime'
* pm-runtime:
PM / Runtime: Spelling s/competing/completing/
PM / Runtime: s/foo_process_requests/foo_process_next_request/
PM / Runtime: GENERIC_SUBSYS_PM_OPS is gone
PM / Runtime: Correct documented return values for generic PM callbacks
PM / Runtime: Split line longer than 80 characters
PM / Runtime: dev_pm_info.runtime_error is signed
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/power/generic_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/generic_ops.c b/drivers/base/power/generic_ops.c index a2e55bfdf572..96a92db83cad 100644 --- a/drivers/base/power/generic_ops.c +++ b/drivers/base/power/generic_ops.c @@ -285,7 +285,7 @@ int pm_generic_restore(struct device *dev) EXPORT_SYMBOL_GPL(pm_generic_restore); /** - * pm_generic_complete - Generic routine competing a device power transition. + * pm_generic_complete - Generic routine completing a device power transition. * @dev: Device to handle. * * Complete a device power transition during a system-wide power transition. |