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

Merge branch 'delayed_inode' into inode_numbers 



Conflicts:
	fs/btrfs/inode.c
	fs/btrfs/ioctl.c
	fs/btrfs/transaction.c

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parents 09655373 16cdcec7
Expand all 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