Merge branch 'master' of git://oss.sgi.com/xfs/xfs into for-linus