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