Merge branch 'btrfs-3.0' into for-linus

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

Thu, 18 Aug 2011 14:38:03 +0000 (10:38 -0400)

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

Thu, 18 Aug 2011 14:38:03 +0000 (10:38 -0400)
author Chris Mason <chris.mason@oracle.com>
Thu, 18 Aug 2011 14:38:03 +0000 (10:38 -0400)
committer Chris Mason <chris.mason@oracle.com>
Thu, 18 Aug 2011 14:38:03 +0000 (10:38 -0400)
diff --cc fs/btrfs/ctree.h
Simple merge
diff --cc fs/btrfs/file.c
Simple merge
diff --cc fs/btrfs/ioctl.c
Simple merge
author	Chris Mason <chris.mason@oracle.com>
	Thu, 18 Aug 2011 14:38:03 +0000 (10:38 -0400)
committer	Chris Mason <chris.mason@oracle.com>
	Thu, 18 Aug 2011 14:38:03 +0000 (10:38 -0400)
		1	2
fs/btrfs/ctree.h	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/file.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ioctl.c	patch \|	diff1 \|	diff2 \|	blob \| history