tree 2a8c24c856fa3f5d7d58a3eb39da943ca1c57e65
parent bcf8a3dfcb274cf6654a19e12e244f3af8c0d355
parent 451d0f599934fd97faf54a5d7954b518e66192cb
author Linus Torvalds <torvalds@linux-foundation.org> 1326400761 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1326400761 -0800

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