From: Rafael J. Wysocki Date: Wed, 4 Jan 2012 23:06:24 +0000 (+0100) Subject: Merge branch 'pm-sleep' into pm-for-linus X-Git-Tag: v3.3-rc1~167^2 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=c233523b3d392e530033a7587d7970dc62a02361;p=linux.git Merge branch 'pm-sleep' into pm-for-linus * pm-sleep: PM / Hibernate: Implement compat_ioctl for /dev/snapshot --- c233523b3d392e530033a7587d7970dc62a02361