commit | f945b7abcb6cfd3106c9855aa2aa6e4396a19d76 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 03 15:27:58 2009 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 03 15:27:58 2009 -0700 |
tree | 2e141cbb9c7b1d76123310695d74b4456723164a | |
parent | 04c860c188ebdcf396fd50751592fb5a9f51287a [diff] | |
parent | fc280c9692031ee41545d6bea00bbb7c7dec97a9 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: allow private mappings of "direct_io" files fuse: allow kernel to access "direct_io" files