]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Sep 2010 18:12:59 +0000 (11:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Sep 2010 18:12:59 +0000 (11:12 -0700)
commitc8c727db413e18414dc6ebc2cc4f18f390763e17
treea57102fff430d3cb5d2db3a193409850e85047be
parent4f63e3c5be2ab55d47d89ea1d32d2c27254daf26
parentb9ca67b2ddf021491a3741d9555e8ff59b2175ba
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