| commit | c233523b3d392e530033a7587d7970dc62a02361 | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rjw@sisk.pl> | Thu Jan 05 00:06:24 2012 +0100 |
| committer | Rafael J. Wysocki <rjw@sisk.pl> | Thu Jan 05 00:06:24 2012 +0100 |
| tree | dc7df403ebc50de7c745c1904f093897c234cf18 | |
| parent | 9ec23949a2d1cb2574c5ec927ccab6dc5685e5f9 [diff] | |
| parent | c336078bf65c4d38caa9a4b8b7b7261c778e622c [diff] |
Merge branch 'pm-sleep' into pm-for-linus * pm-sleep: PM / Hibernate: Implement compat_ioctl for /dev/snapshot