From: Chris Mason <chris.mason@oracle.com>
Date: Mon, 23 May 2011 10:30:52 +0000 (-0400)
Subject: Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/arne/btrfs... 
X-Git-Tag: v3.0-rc1~38^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=712673339a0d085358fd1cd3a6477cc7979bb69f;p=pandora-kernel.git

Merge branch 'for-chris' of git://git./linux/kernel/git/arne/btrfs-unstable-arne into inode_numbers

Conflicts:
	fs/btrfs/Makefile
	fs/btrfs/ctree.h
	fs/btrfs/volumes.h

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

712673339a0d085358fd1cd3a6477cc7979bb69f
Reading git-diff-tree failed