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)
commit6733e54b669c600eb8e451939ad55130db664fed
tree2a8c24c856fa3f5d7d58a3eb39da943ca1c57e65
parentbcf8a3dfcb274cf6654a19e12e244f3af8c0d355
parent451d0f599934fd97faf54a5d7954b518e66192cb
Merge branch 'for-linus' of git://git./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