From: Chris Mason <chris.mason@oracle.com>
Date: Thu, 29 Mar 2012 00:33:40 +0000 (-0400)
Subject: Merge git://git.jan-o-sch.net/btrfs-unstable into for-linus
X-Git-Tag: v3.4-rc1~22^2~11
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=98961a7e431735c791dbaaf0337029e219a5db5a;p=~andy%2Flinux

Merge git://git.jan-o-sch.net/btrfs-unstable into for-linus

Conflicts:
	fs/btrfs/transaction.c

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

98961a7e431735c791dbaaf0337029e219a5db5a