diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-21 21:14:24 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-21 21:14:24 +0100 |
commit | 5c89e9ea7ef1feaa147325b2ab47a89a147fb903 (patch) | |
tree | 5b9edb4b4ee54fb3c30da5de75c755e8596ff4cc /arch/blackfin/include/asm/dma-mapping.h | |
parent | Merge tag 'pci-v4.5-changes' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
parent | fuse: add support for SEEK_HOLE and SEEK_DATA in lseek (diff) | |
download | linux-5c89e9ea7ef1feaa147325b2ab47a89a147fb903.tar.xz linux-5c89e9ea7ef1feaa147325b2ab47a89a147fb903.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
Pull fuse updates from Miklos Szeredi:
"This adds SEEK_HOLE and SEEK_DATA support in lseek"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
fuse: add support for SEEK_HOLE and SEEK_DATA in lseek
Diffstat (limited to 'arch/blackfin/include/asm/dma-mapping.h')
0 files changed, 0 insertions, 0 deletions