]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
projects / thirdparty / kernel / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 743e89e c628ee6)
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)
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

1  2 
fs/fuse/file.c patch | diff1 | diff2 | blob | history
fs/fuse/inode.c patch | diff1 | diff2 | blob | history

diff --cc fs/fuse/file.c
Simple merge
diff --cc fs/fuse/inode.c
Simple merge
A mirror of Linus' kernel repository