tree 43f5617022c7c947c3c63664e49eb9575ab82f2f
parent 0d0ca30f180906224be6279788f2b202cfd959d8
parent 4ea028859bbdad34b84c9951fbb832ae10c6a96c
author Chris Mason <chris.mason@oracle.com> 1306082022 -0400
committer Chris Mason <chris.mason@oracle.com> 1306082022 -0400

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>