From: Rafael J. Wysocki Date: Sun, 16 Oct 2011 21:26:49 +0000 (+0200) Subject: Merge branch 'pm-runtime' into pm-for-linus X-Git-Tag: firefly_0821_release~3680^2~4322^2~20 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9bd717c0dc8224cadfd66df7eeff98c987711d98;p=firefly-linux-kernel-4.4.55.git Merge branch 'pm-runtime' into pm-for-linus * pm-runtime: PM / Runtime: Handle .runtime_suspend() failure correctly PM / Runtime: Fix kerneldoc comment for rpm_suspend() PM / Runtime: Update document about callbacks --- 9bd717c0dc8224cadfd66df7eeff98c987711d98