Skip to content
Commit 0e4e0263 authored by Chris Mason's avatar Chris Mason
Browse files

Merge branch 'for-linus' into raid56-experimental 



Conflicts:
	fs/btrfs/volumes.c

Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parents 1f0905ec 1eafa6c7
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment