From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 7 Feb 2015 19:04:48 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux... 
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~8819
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=bdfeb5a10471530dc93098e7b7663628ec951407;p=mirror_ubuntu-artful-kernel.git

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()
---

bdfeb5a10471530dc93098e7b7663628ec951407