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

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

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

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

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

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

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

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

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

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