]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit327235e56abd12796d901592aa613b542b6b3845
tree5b9edb4b4ee54fb3c30da5de75c755e8596ff4cc
parentaab8a2b3d4c94c2254f48d3e74ec57294fe6c7d0
parentdc2aefaf36f30625d5eac204d22c9b2210ae0675
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