From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 19 Apr 2012 00:29:05 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi... 
X-Git-Tag: v3.4-rc4~28
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dbfad21422f8d2c0866185b3e449c4a6ebaec4e2;p=karo-tx-linux.git

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
---

dbfad21422f8d2c0866185b3e449c4a6ebaec4e2