From: Chris Mason <chris.mason@oracle.com>
Date: Fri, 17 Jun 2011 18:16:13 +0000 (-0400)
Subject: Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs... 
X-Git-Tag: v3.0-rc4~9^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e038dca803423bb7a3fa9a162b7dcc225efe9bf9;p=pandora-kernel.git

Merge branch 'for-chris' of git://git./linux/kernel/git/josef/btrfs-work into for-linus

Conflicts:
	fs/btrfs/transaction.c

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

e038dca803423bb7a3fa9a162b7dcc225efe9bf9
Reading git-diff-tree failed