Merge tag 'for-linus-v3.6-rc7' of git://oss.sgi.com/xfs/xfs