diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-29 15:00:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-29 15:00:44 -0700 |
| commit | 6cfdd02b886aac866098f33262d409565f101ce0 (patch) | |
| tree | 178b5abf48eb98b9ef0a29d865d7214798ed8b57 /fs/fat/inode.c | |
| parent | 64f371bc3107e69efce563a3d0f0e6880de0d537 (diff) | |
| parent | 26e0f90fded422f309deb6169dfbccb204435698 (diff) | |
Merge tag 'pm-for-3.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fixes from Rafael J. Wysocki:
"Fix for an issue causing hibernation to hang on systems with highmem
(that practically means i386) due to broken memory management (bug
introduced in 3.2, so -stable material) and PM documentation update
making the freezer documentation follow the code again after some
recent updates."
* tag 'pm-for-3.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM / Freezer / Docs: Update documentation about freezing of tasks
PM / Hibernate: fix the number of pages used for hibernate/thaw buffering
Diffstat (limited to 'fs/fat/inode.c')
0 files changed, 0 insertions, 0 deletions