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