Merge rsync://oss.sgi.com/git/xfs-2.6