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)
commitdbfad21422f8d2c0866185b3e449c4a6ebaec4e2
treea30de27f59ddce92ba9b950d5bb1b20ff23191b4
parent743e89ebc0215900040b1c2d1563d70a22ac2cb0
parentc628ee67fb15a0d8d48351aa2e487c5f14779785
Merge branch 'for-linus' of git://git./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