Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
commit30aaca4582eac20a52ac7b2ec35bdb908133e5b1
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Dec 2011 02:23:35 +0000 (14 18:23 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Dec 2011 02:23:35 +0000 (14 18:23 -0800)
treeddc71661851922ba75dbeb0e6f272e9c2a0895fb
parentddb360778a86bcf55d856bc15df3ebd2e77afff1
parent73104b6e37f75f822e3dcf016147c322d1f6dad9
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: llseek fix race
  fuse: fix llseek bug
  fuse: fix fuse_retrieve