Merge branch 'xfs-4.8-misc-fixes-4' into for-next

author Dave Chinner <david@fromorbit.com>

Fri, 22 Jul 2016 04:10:56 +0000 (14:10 +1000)

committer Dave Chinner <david@fromorbit.com>

Fri, 22 Jul 2016 04:10:56 +0000 (14:10 +1000)
author Dave Chinner <david@fromorbit.com>
Fri, 22 Jul 2016 04:10:56 +0000 (14:10 +1000)
committer Dave Chinner <david@fromorbit.com>
Fri, 22 Jul 2016 04:10:56 +0000 (14:10 +1000)
diff --cc fs/xfs/xfs_aops.c
Simple merge
diff --cc fs/xfs/xfs_buf_item.c
Simple merge
diff --cc fs/xfs/xfs_file.c
Simple merge
diff --cc fs/xfs/xfs_super.c
Simple merge
author	Dave Chinner <david@fromorbit.com>
	Fri, 22 Jul 2016 04:10:56 +0000 (14:10 +1000)
committer	Dave Chinner <david@fromorbit.com>
	Fri, 22 Jul 2016 04:10:56 +0000 (14:10 +1000)
		1	2
fs/xfs/xfs_aops.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_buf_item.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_file.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_super.c	patch \|	diff1 \|	diff2 \|	blob \| history