]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d434215 0b5da8d)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jan 2016 20:14:24 +0000 (12:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jan 2016 20:14:24 +0000 (12:14 -0800)
commit5c89e9ea7ef1feaa147325b2ab47a89a147fb903
tree5b9edb4b4ee54fb3c30da5de75c755e8596ff4cctree
parentd43421565bf0510d35e6a39ebf96586ad486f3aacommit | diff
parent0b5da8db145bfd44266ac964a2636a0cf8d7c286commit | diff
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
fs/fuse/file.c diff1 | diff2 | blob | history
Ubuntu combined Linux kernel mirror