tree a57102fff430d3cb5d2db3a193409850e85047be
parent 4f63e3c5be2ab55d47d89ea1d32d2c27254daf26
parent b9ca67b2ddf021491a3741d9555e8ff59b2175ba
author Linus Torvalds <torvalds@linux-foundation.org> 1283969579 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1283969579 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: fix lock annotations
  fuse: flush background queue on connection close