From: Chris Mason <chris.mason@oracle.com>
Date: Sat, 28 May 2011 11:00:39 +0000 (-0400)
Subject: Merge branch 'for-chris' of
X-Git-Tag: v3.0-rc2~5^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff5714cca971848963b87d6b477c16ca8abbaa54;p=pandora-kernel.git

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

Conflicts:
	fs/btrfs/disk-io.c
	fs/btrfs/extent-tree.c
	fs/btrfs/free-space-cache.c
	fs/btrfs/inode.c
	fs/btrfs/transaction.c

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

ff5714cca971848963b87d6b477c16ca8abbaa54
Reading git-diff-tree failed