tree caade75fc97787cb03833fddcd90b704696686d7
parent 26cdd1f76a889a21faa851bcb260782db2c7f0a9
parent 3da5ab56482f322a9736c484db8773899c5c731b
author Linus Torvalds <torvalds@linux-foundation.org> 1423335888 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1423335888 -0800

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

Pull btrfs fix from Chris Mason:
 "Forrest Liu tracked down a missing blk_finish_plug in the btrfs
  logging code.  This isn't a new bug, and it's hard to hit.  But, it's
  safe enough for inclusion now, and in my for-linus branch"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: add missing blk_finish_plug in btrfs_sync_log()