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

author Dave Chinner <[email protected]>

Sun, 6 Mar 2016 22:34:54 +0000 (09:34 +1100)

committer Dave Chinner <[email protected]>

Sun, 6 Mar 2016 22:34:54 +0000 (09:34 +1100)
author Dave Chinner <[email protected]>
Sun, 6 Mar 2016 22:34:54 +0000 (09:34 +1100)
committer Dave Chinner <[email protected]>
Sun, 6 Mar 2016 22:34:54 +0000 (09:34 +1100)
diff --cc fs/xfs/libxfs/xfs_bmap.c
Simple merge
diff --cc fs/xfs/libxfs/xfs_bmap_btree.c
Simple merge
diff --cc fs/xfs/xfs_mount.c
Simple merge
diff --cc fs/xfs/xfs_mount.h
Simple merge
author	Dave Chinner <[email protected]>
	Sun, 6 Mar 2016 22:34:54 +0000 (09:34 +1100)
committer	Dave Chinner <[email protected]>
	Sun, 6 Mar 2016 22:34:54 +0000 (09:34 +1100)
		1	2
fs/xfs/libxfs/xfs_bmap.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/libxfs/xfs_bmap_btree.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_mount.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_mount.h	patch \|	diff1 \|	diff2 \|	blob \| history