Merge branch 'for-linus' into for-linus-3.12
authorChris Mason <chris.mason@fusionio.com>
Sat, 5 Oct 2013 14:51:32 +0000 (10:51 -0400)
committerChris Mason <chris.mason@fusionio.com>
Sat, 5 Oct 2013 14:51:32 +0000 (10:51 -0400)
1  2 
fs/btrfs/dev-replace.c
fs/btrfs/volumes.c

Simple merge
Simple merge