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

Merge branch 'xfs-misc-fixes-for-4.1-3' into for-next 

Conflicts:
	fs/xfs/xfs_iops.c
parents a448f8f1 21c3ea18
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