Merge branch 'for-chris-fixed' of git://git.jan-o-sch.net/btrfs-unstable

author Chris Mason <chris.mason@fusionio.com>

Thu, 25 Oct 2012 19:53:10 +0000 (15:53 -0400)

committer Chris Mason <chris.mason@fusionio.com>

Thu, 25 Oct 2012 19:53:10 +0000 (15:53 -0400)
author Chris Mason <chris.mason@fusionio.com>
Thu, 25 Oct 2012 19:53:10 +0000 (15:53 -0400)
committer Chris Mason <chris.mason@fusionio.com>
Thu, 25 Oct 2012 19:53:10 +0000 (15:53 -0400)
diff --cc fs/btrfs/backref.c
Simple merge
diff --cc fs/btrfs/ctree.h
Simple merge
author	Chris Mason <chris.mason@fusionio.com>
	Thu, 25 Oct 2012 19:53:10 +0000 (15:53 -0400)
committer	Chris Mason <chris.mason@fusionio.com>
	Thu, 25 Oct 2012 19:53:10 +0000 (15:53 -0400)
		1	2
fs/btrfs/backref.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ctree.h	patch \|	diff1 \|	diff2 \|	blob \| history