author | Linus Torvalds <torvalds@linux-foundation.org> | |
Thu, 15 Dec 2011 02:23:35 +0000 (18:23 -0800) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Thu, 15 Dec 2011 02:23:35 +0000 (18:23 -0800) |
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
fuse: llseek fix race
fuse: fix llseek bug
fuse: fix fuse_retrieve
fuse: llseek fix race
fuse: fix llseek bug
fuse: fix fuse_retrieve
Trivial merge