From: Chris Mason <chris.mason@oracle.com>
Date: Sun, 22 May 2011 16:33:42 +0000 (-0400)
Subject: Merge branch 'cleanups' of git://repo.or.cz/linux-2.6/btrfs-unstable into inode_numbers
X-Git-Tag: v3.0-rc1~38^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=945d8962ceee6bb273365d0bdf42f763225b290f;p=pandora-kernel.git

Merge branch 'cleanups' of git://repo.or.cz/linux-2.6/btrfs-unstable into inode_numbers

Conflicts:
	fs/btrfs/extent-tree.c
	fs/btrfs/free-space-cache.c
	fs/btrfs/inode.c
	fs/btrfs/tree-log.c

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

945d8962ceee6bb273365d0bdf42f763225b290f
Reading git-diff-tree failed