summaryrefslogtreecommitdiff
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-01-22 17:35:38 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-22 17:35:38 -0800
commitb82dde0230439215b55e545880e90337ee16f51a (patch)
tree8252f8b8d3d91a9473c9bd45ca441e52cff1dd7d /block/blk-merge.c
parent79d245327f61ff21e7b9427c61fded5442734233 (diff)
parent884a12a5972fc867a93f7adf7a8ac2ade5d38fff (diff)
Merge tag 'please-pull-copy_file_range' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 copy_file_range syscall update from Tony Luck: "Another release, another new syscall to wire up" * tag 'please-pull-copy_file_range' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: [IA64] Enable copy_file_range syscall for ia64
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions