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

Merge branch 'xfs-misc-fixes-2-for-3.16' into for-next 

Conflicts:
	fs/xfs/xfs_ialloc.c
parents 2d6dcc6d 376c2f3a
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