Merge tag 'xfs-for-linus-3.17-rc1' of git://oss.sgi.com/xfs/xfs