]> git.kernelconcepts.de Git - mv-sheeva.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Mar 2011 01:53:04 +0000 (17:53 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Mar 2011 01:53:04 +0000 (17:53 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: fix truncate after open
  fuse: fix hang of single threaded fuseblk filesystem


Trivial merge