Merge branch 'pm-sleep' into pm-for-linus
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 4 Jan 2012 23:06:24 +0000 (00:06 +0100)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 4 Jan 2012 23:06:24 +0000 (00:06 +0100)
* pm-sleep:
  PM / Hibernate: Implement compat_ioctl for /dev/snapshot


Trivial merge