diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-01-05 00:06:24 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-01-05 00:06:24 +0100 |
| commit | c233523b3d392e530033a7587d7970dc62a02361 (patch) | |
| tree | dc7df403ebc50de7c745c1904f093897c234cf18 /Makefile | |
| parent | 9ec23949a2d1cb2574c5ec927ccab6dc5685e5f9 (diff) | |
| parent | c336078bf65c4d38caa9a4b8b7b7261c778e622c (diff) | |
| download | linux-c233523b3d392e530033a7587d7970dc62a02361.tar.gz linux-c233523b3d392e530033a7587d7970dc62a02361.tar.bz2 linux-c233523b3d392e530033a7587d7970dc62a02361.zip | |
Merge branch 'pm-sleep' into pm-for-linus
* pm-sleep:
PM / Hibernate: Implement compat_ioctl for /dev/snapshot
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions