From: Chris Mason <chris.mason@oracle.com>
Date: Mon, 23 May 2011 18:37:47 +0000 (-0400)
Subject: Merge branch 'cleanups_and_fixes' into inode_numbers
X-Git-Tag: v3.0-rc1~38^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6c0cb379c5198487e4ac124728cbb2346d63b1f;p=pandora-kernel.git

Merge branch 'cleanups_and_fixes' into inode_numbers

Conflicts:
	fs/btrfs/tree-log.c
	fs/btrfs/volumes.c

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

d6c0cb379c5198487e4ac124728cbb2346d63b1f
Reading git-diff-tree failed