summaryrefslogtreecommitdiff
path: root/arch/cris/include/asm
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2012-01-05 03:06:24 +0400
committerRafael J. Wysocki <rjw@sisk.pl>2012-01-05 03:06:24 +0400
commitc233523b3d392e530033a7587d7970dc62a02361 (patch)
treedc7df403ebc50de7c745c1904f093897c234cf18 /arch/cris/include/asm
parent9ec23949a2d1cb2574c5ec927ccab6dc5685e5f9 (diff)
parentc336078bf65c4d38caa9a4b8b7b7261c778e622c (diff)
downloadlinux-c233523b3d392e530033a7587d7970dc62a02361.tar.xz
Merge branch 'pm-sleep' into pm-for-linus
* pm-sleep: PM / Hibernate: Implement compat_ioctl for /dev/snapshot
Diffstat (limited to 'arch/cris/include/asm')
0 files changed, 0 insertions, 0 deletions