Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Aug 2010 20:18:36 +0000 (13:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Aug 2010 20:18:36 +0000 (13:18 -0700)
commitfe21ea18c742ab0eb8f6f8ebc543374839a02a87
treece34b75b8b522331425b9c151cdd1e71226e8d9a
parenta57f9a3e811cf1246b394f0cc667c6bc5a52e099
parent2d45ba381a74a743eeaa2b06c7c5c0d2bf73ba1a
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: add retrieve request
  fuse: add store request
  fuse: don't use atomic kmap