From: Chris Mason <chris.mason@fusionio.com>
Date: Wed, 25 Jul 2012 20:11:38 +0000 (-0400)
Subject: Merge branch 'qgroup' of git://git.jan-o-sch.net/btrfs-unstable into for-linus
X-Git-Tag: v3.6-rc1~81^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b478b2baa37ac99fc04a30809c780dd5dfd43595;p=pandora-kernel.git

Merge branch 'qgroup' of git://git.jan-o-sch.net/btrfs-unstable into for-linus

Conflicts:
	fs/btrfs/ioctl.c
	fs/btrfs/ioctl.h
	fs/btrfs/transaction.c
	fs/btrfs/transaction.h

Signed-off-by: Chris Mason <chris.mason@fusionio.com>
---

b478b2baa37ac99fc04a30809c780dd5dfd43595
Reading git-diff-tree failed