]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Apr 2012 00:29:05 +0000 (17:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Apr 2012 00:29:05 +0000 (17:29 -0700)
commit719ea79b88c79bca001f5bd8e9ea8b359bc61d49
treea30de27f59ddce92ba9b950d5bb1b20ff23191b4
parent5573ba4b5274c072b36f38193fb111f95dc637d1
parent88d2ecf6e43395d324e1c0c14a50d76a981c868d
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse

Pull fuse updates from Miklos Szeredi.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: use flexible array in fuse.h
  fuse: allow nanosecond granularity
  fuse: O_DIRECT support for files
  fuse: fix nlink after unlink
fs/fuse/file.c
fs/fuse/inode.c