Skip to content
Commit b70f14e1 authored by Dave Chinner's avatar Dave Chinner
Browse files

Merge branch 'xfs-feature-bit-cleanup' into for-next 

Conflicts:
	fs/xfs/xfs_inode.c
parents 0d907a3b ab3e57b5
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment