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

author Dave Chinner <david@fromorbit.com>

Sun, 12 Oct 2014 23:22:45 +0000 (10:22 +1100)

committer Dave Chinner <david@fromorbit.com>

Sun, 12 Oct 2014 23:22:45 +0000 (10:22 +1100)
author Dave Chinner <david@fromorbit.com>
Sun, 12 Oct 2014 23:22:45 +0000 (10:22 +1100)
committer Dave Chinner <david@fromorbit.com>
Sun, 12 Oct 2014 23:22:45 +0000 (10:22 +1100)
diff --cc fs/xfs/xfs_aops.c
Simple merge
diff --cc fs/xfs/xfs_bmap_util.c
Simple merge
diff --cc fs/xfs/xfs_inode.c
Simple merge
diff --cc fs/xfs/xfs_ioctl.c
Simple merge
author	Dave Chinner <david@fromorbit.com>
	Sun, 12 Oct 2014 23:22:45 +0000 (10:22 +1100)
committer	Dave Chinner <david@fromorbit.com>
	Sun, 12 Oct 2014 23:22:45 +0000 (10:22 +1100)
		1	2
fs/xfs/xfs_aops.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_bmap_util.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_inode.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_ioctl.c	patch \|	diff1 \|	diff2 \|	blob \| history