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