From: Linus Torvalds Date: Thu, 12 Jan 2012 20:39:21 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi... X-Git-Tag: firefly_0821_release~3680^2~3736 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6733e54b669c600eb8e451939ad55130db664fed;p=firefly-linux-kernel-4.4.55.git 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 --- 6733e54b669c600eb8e451939ad55130db664fed