Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
commitf945b7abcb6cfd3106c9855aa2aa6e4396a19d76
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Apr 2009 22:27:58 +0000 (3 15:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Apr 2009 22:27:58 +0000 (3 15:27 -0700)
tree2e141cbb9c7b1d76123310695d74b4456723164a
parent04c860c188ebdcf396fd50751592fb5a9f51287a
parentfc280c9692031ee41545d6bea00bbb7c7dec97a9
Merge branch 'for-linus' of git://git./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