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

Merge branch 'xfs-attr-cleanup' into for-next 

Conflicts:
	fs/xfs/xfs_attr.c
parents ff14ee42 6c888af0
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