Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'for-chris' of... 

Merge branch 'for-chris' of http://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work

 into integration

Conflicts:
	fs/btrfs/inode.c

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parents e755d9ab e65cbb94
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