tree 96529bbf38c5933e188711db56d55c61540ffe46
parent a34689d98059f0c88cef08a78866e81eb53466c9
parent f3a87f1b0c4086a408eda48e4c26e32ff80d3124
author Linus Torvalds <torvalds@linux-foundation.org> 1347825524 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1347825524 -0700

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

Pull a btrfs revert from Chris Mason:
 "My for-linus branch has one revert in the new quota code.

  We're building up more fixes at etc for the next merge window, but I'm
  keeping them out unless they are bigger regressions or have a huge
  impact."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Revert "Btrfs: fix some error codes in btrfs_qgroup_inherit()"