diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-11 18:57:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-11 18:57:05 -0700 |
| commit | 0e6f76c70e53e55492e6d6bc8cbc5e04dab01213 (patch) | |
| tree | 18a500334908878cdd99c2f09193170ba1ae4996 /fs/notify/Kconfig | |
| parent | 1d929b7a84438ad9012c5826f5617d79a3efcef1 (diff) | |
| parent | 36cb7035ea0c11ef2c7fa2bbe0cd181b23569b29 (diff) | |
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 / Hibernate: Fix ioctl SNAPSHOT_S2RAM
PM / Hibernate: Make snapshot_release() restore GFP mask
PM: Fix warning in pm_restrict_gfp_mask() during SNAPSHOT_S2RAM ioctl
Diffstat (limited to 'fs/notify/Kconfig')
0 files changed, 0 insertions, 0 deletions