Merge branch 'integration' into for-linus

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

Wed, 27 Jul 2011 20:13:10 +0000 (16:13 -0400)

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

Wed, 27 Jul 2011 20:18:13 +0000 (16:18 -0400)
author Chris Mason <chris.mason@oracle.com>
Wed, 27 Jul 2011 20:13:10 +0000 (16:13 -0400)
committer Chris Mason <chris.mason@oracle.com>
Wed, 27 Jul 2011 20:18:13 +0000 (16:18 -0400)
diff --cc fs/btrfs/ctree.h
Simple merge
diff --cc fs/btrfs/extent_io.c
Simple merge
diff --cc fs/btrfs/inode.c
Simple merge
diff --cc fs/btrfs/relocation.c
Simple merge
author	Chris Mason <chris.mason@oracle.com>
	Wed, 27 Jul 2011 20:13:10 +0000 (16:13 -0400)
committer	Chris Mason <chris.mason@oracle.com>
	Wed, 27 Jul 2011 20:18:13 +0000 (16:18 -0400)
		1	2
fs/btrfs/ctree.h	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent_io.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/relocation.c	patch \|	diff1 \|	diff2 \|	blob \| history