]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 May 2011 01:57:05 +0000 (18:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 May 2011 01:57:05 +0000 (18:57 -0700)
commit424221ee71097fa689e13dad6ecc8061e45bea74
tree18a500334908878cdd99c2f09193170ba1ae4996
parent118be65b819c8d3e6b67104deec76e9def82a763
parent976d3967534a77b02ec538bd509d7022172544e3
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