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

Conflicts:
	fs/xfs/xfs_iops.c

diff --cc fs/xfs/libxfs/xfs_bmap.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_da_btree.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_dir2.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_dir2_block.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_dir2_leaf.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_dir2_node.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_dir2_sf.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_ialloc.c
Simple merge

diff --cc fs/xfs/xfs_buf.c
Simple merge

diff --cc fs/xfs/xfs_dir2_readdir.c
Simple merge

diff --cc fs/xfs/xfs_export.c
Simple merge

diff --cc fs/xfs/xfs_icache.c
Simple merge

diff --cc fs/xfs/xfs_inode.c
Simple merge

diff --cc fs/xfs/xfs_iomap.c
Simple merge

diff --cc fs/xfs/xfs_iops.c
Simple merge

diff --cc fs/xfs/xfs_itable.c
Simple merge

diff --cc fs/xfs/xfs_log.c
Simple merge

diff --cc fs/xfs/xfs_log_recover.c
Simple merge

diff --cc fs/xfs/xfs_mount.c
Simple merge

diff --cc fs/xfs/xfs_super.c
Simple merge

diff --cc fs/xfs/xfs_trans_buf.c
Simple merge