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

Merge branch 'cleanups_and_fixes' into inode_numbers 



Conflicts:
	fs/btrfs/tree-log.c
	fs/btrfs/volumes.c

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parents 8e531cdf 1f78160c
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