tree 1c3b80fc15b7d4880d8bb67f39ddd4e78db504fd
parent bae1577e3df471f6752e4b15380d6c67e8e17e8f
parent c05f9429e12da7c7de2649ef8c8c16bf8c12061f
author Linus Torvalds <torvalds@linux-foundation.org> 1439088991 +0300
committer Linus Torvalds <torvalds@linux-foundation.org> 1439088991 +0300

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

Pull btrfs fix from Chris Mason:
 "We have a btrfs quota regression fix.

  I merged this one on Thursday and have run it through tests against
  current master.

  Normally I wouldn't have sent this while you were finalizing rc6, but
  I'm feeding mosquitoes in the adirondacks next week, so I wanted to
  get this one out before leaving.  I'll leave longer tests running and
  check on things during the week, but I don't expect any problems"

* 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs: qgroup: Fix a regression in qgroup reserved space.