Merge branch 'btrfs-3.0' into for-linus

author Chris Mason <[email protected]>

Sun, 18 Sep 2011 14:31:44 +0000 (10:31 -0400)

committer Chris Mason <[email protected]>

Sun, 18 Sep 2011 14:31:44 +0000 (10:31 -0400)
author Chris Mason <[email protected]>
Sun, 18 Sep 2011 14:31:44 +0000 (10:31 -0400)
committer Chris Mason <[email protected]>
Sun, 18 Sep 2011 14:31:44 +0000 (10:31 -0400)
diff --cc fs/btrfs/inode.c
Simple merge
diff --cc fs/btrfs/ioctl.c
Simple merge
author	Chris Mason <[email protected]>
	Sun, 18 Sep 2011 14:31:44 +0000 (10:31 -0400)
committer	Chris Mason <[email protected]>
	Sun, 18 Sep 2011 14:31:44 +0000 (10:31 -0400)
		1	2
fs/btrfs/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ioctl.c	patch \|	diff1 \|	diff2 \|	blob \| history