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

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

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

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

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

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

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

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

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

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