From: Linus Torvalds <torvalds@linux-foundation.org>
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-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6733e54b669c600eb8e451939ad55130db664fed;p=openwrt%2Fstaging%2Fblogic.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