| commit | dbfad21422f8d2c0866185b3e449c4a6ebaec4e2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 18 17:29:05 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 18 17:29:05 2012 -0700 |
| tree | a30de27f59ddce92ba9b950d5bb1b20ff23191b4 | |
| parent | 743e89ebc0215900040b1c2d1563d70a22ac2cb0 [diff] | |
| parent | c628ee67fb15a0d8d48351aa2e487c5f14779785 [diff] |
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