From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Jul 2014 23:16:34 +0000 (-0700)
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=0246544fc9abcc5850cfc4cfcfe6c16067541024;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for-linus' of git://git./linux/kernel/git/mszeredi/fuse

Pull fuse fixes from Miklos Szeredi:
 "These two pathes fix issues with the kernel-userspace protocol changes
  in v3.15"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: add FUSE_NO_OPEN_SUPPORT flag to INIT
  fuse: s_time_gran fix
---

0246544fc9abcc5850cfc4cfcfe6c16067541024