Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
commite9de427e403f2670a44b5795707d8a240fb018c2
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Apr 2009 17:12:07 +0000 (14 10:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Apr 2009 17:12:07 +0000 (14 10:12 -0700)
tree2455a30ed360995a22e741d9ca87bc213c2f7d2d
parent9fc0178caa30070f65bded433f91756491a3cf26
parent3121bfe7631126d1b13064855ac2cfa164381bb0
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: fix "direct_io" private mmap
  fuse: fix argument type in fuse_get_user_pages()