Merge branch 'master' of git://oss.sgi.com:8090/xfs/linux-2.6