tree 2e141cbb9c7b1d76123310695d74b4456723164a
parent 04c860c188ebdcf396fd50751592fb5a9f51287a
parent fc280c9692031ee41545d6bea00bbb7c7dec97a9
author Linus Torvalds <torvalds@linux-foundation.org> 1238797678 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1238797678 -0700

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