diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 21:03:03 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 21:03:03 +0100 |
commit | 529e89430d6c0d64db8ac474cb95e68e2527c79a (patch) | |
tree | 0407825d29351d04474b3a1294f2b4d42a1e8e03 /fs/nfs | |
parent | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
parent | PM: rwsem.h need not be included into main.c (diff) | |
download | linux-529e89430d6c0d64db8ac474cb95e68e2527c79a.tar.xz linux-529e89430d6c0d64db8ac474cb95e68e2527c79a.zip |
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()
Diffstat (limited to 'fs/nfs')
0 files changed, 0 insertions, 0 deletions