]> 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, 12 Jan 2012 20:39:21 +0000 (12:39 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Jan 2012 20:39:21 +0000 (12:39 -0800)
commit7904ab90ac018be1f61411bdeec4ad31059fe5ad
tree2a8c24c856fa3f5d7d58a3eb39da943ca1c57e65
parentd02d99d05b094efd62914062f884f5eac63e635e
parent02519ac9147c35b594b7c2a4c4f9d2a3dd178583
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  FUSE: Notifying the kernel of deletion.
  fuse: support ioctl on directories
  fuse: Use kcalloc instead of kzalloc to allocate array
  fuse: llseek optimize SEEK_CUR and SEEK_SET
fs/fuse/dir.c
fs/fuse/fuse_i.h