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

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

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

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

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

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