summaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4proc.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2012-01-05 00:06:24 +0100
committerRafael J. Wysocki <rjw@sisk.pl>2012-01-05 00:06:24 +0100
commitc233523b3d392e530033a7587d7970dc62a02361 (patch)
treedc7df403ebc50de7c745c1904f093897c234cf18 /fs/nfs/nfs4proc.c
parentMerge branch 'pm-freezer' into pm-for-linus (diff)
parentPM / Hibernate: Implement compat_ioctl for /dev/snapshot (diff)
downloadlinux-c233523b3d392e530033a7587d7970dc62a02361.tar.xz
linux-c233523b3d392e530033a7587d7970dc62a02361.zip
Merge branch 'pm-sleep' into pm-for-linus
* pm-sleep: PM / Hibernate: Implement compat_ioctl for /dev/snapshot
Diffstat (limited to 'fs/nfs/nfs4proc.c')
0 files changed, 0 insertions, 0 deletions