commit | 529e89430d6c0d64db8ac474cb95e68e2527c79a | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 16 12:03:03 2009 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 16 12:03:03 2009 -0800 |
tree | 0407825d29351d04474b3a1294f2b4d42a1e8e03 | |
parent | 61ecdb84c1f05ad445db4584ae375a15c0e8ae47 [diff] | |
parent | d8bed5a4f343d1826153ecf8e7932126c757a21d [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PM: rwsem.h need not be included into main.c PM: Remove unnecessary goto from device_resume_noirq() PM: Add initcall_debug style timing for suspend/resume PM: allow for usage_count > 0 in pm_runtime_get()