]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Jul 2014 23:16:34 +0000 (16:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Jul 2014 23:16:34 +0000 (16:16 -0700)
commit0246544fc9abcc5850cfc4cfcfe6c16067541024
treef9d5e8aa4fcdcae2a16429c97d739d12fa269091
parent82e13c71bc655b6dc7110da4e164079dadb44892
parentd7afaec0b564f0609e116f562983b8e72fc3e9c9
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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