]> git.proxmox.com Git - mirror_ubuntu-disco-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)
commit0e6f76c70e53e55492e6d6bc8cbc5e04dab01213
tree18a500334908878cdd99c2f09193170ba1ae4996
parent1d929b7a84438ad9012c5826f5617d79a3efcef1
parent36cb7035ea0c11ef2c7fa2bbe0cd181b23569b29
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