Skip to content
GitLab
Commit d756bd2d authored by Chris Mason's avatar Chris Mason
Browse files

Merge branch 'for-chris' of git://repo.or.cz/linux-btrfs-devel into integration 



Conflicts:
	fs/btrfs/volumes.c

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parents 27263e28 b367e47f
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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