Merge branch 'for-linus' into for-linus-3.12

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

Sat, 5 Oct 2013 14:51:32 +0000 (10:51 -0400)

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

Sat, 5 Oct 2013 14:51:32 +0000 (10:51 -0400)
author Chris Mason <chris.mason@fusionio.com>
Sat, 5 Oct 2013 14:51:32 +0000 (10:51 -0400)
committer Chris Mason <chris.mason@fusionio.com>
Sat, 5 Oct 2013 14:51:32 +0000 (10:51 -0400)
diff --cc fs/btrfs/dev-replace.c
Simple merge
diff --cc fs/btrfs/volumes.c
Simple merge
author	Chris Mason <chris.mason@fusionio.com>
	Sat, 5 Oct 2013 14:51:32 +0000 (10:51 -0400)
committer	Chris Mason <chris.mason@fusionio.com>
	Sat, 5 Oct 2013 14:51:32 +0000 (10:51 -0400)
		1	2
fs/btrfs/dev-replace.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/volumes.c	patch \|	diff1 \|	diff2 \|	blob \| history