Merge branch 'for-linus' into raid56-experimental
authorChris Mason <chris.mason@fusionio.com>
Tue, 5 Feb 2013 15:04:03 +0000 (10:04 -0500)
committerChris Mason <chris.mason@fusionio.com>
Tue, 5 Feb 2013 15:04:03 +0000 (10:04 -0500)
Conflicts:
fs/btrfs/volumes.c

Signed-off-by: Chris Mason <chris.mason@fusionio.com>

Trivial merge