Skip to content
Commit c233523b authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-sleep' into pm-for-linus 

* pm-sleep:
  PM / Hibernate: Implement compat_ioctl for /dev/snapshot
parents 9ec23949 c336078b
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment