diff options
| author | Linus Torvalds <[email protected]> | 2010-12-17 17:31:59 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2010-12-17 17:31:59 +0000 |
| commit | 508817e7cd8cb585148d12b5673202142ece2330 (patch) | |
| tree | 5041771f203c906afce49d9e75e5e856f77a903f /fs/ubifs/commit.c | |
| parent | Merge branch 'bkl_removal' of git://git.kernel.org/pub/scm/linux/kernel/git/m... (diff) | |
| parent | PM / Runtime: Fix pm_runtime_suspended() (diff) | |
| download | kernel-508817e7cd8cb585148d12b5673202142ece2330.tar.gz kernel-508817e7cd8cb585148d12b5673202142ece2330.zip | |
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM / Runtime: Fix pm_runtime_suspended()
PM / Hibernate: Restore old swap signature to avoid user space breakage
PM / Hibernate: Fix PM_POST_* notification with user-space suspend
Diffstat (limited to 'fs/ubifs/commit.c')
0 files changed, 0 insertions, 0 deletions