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