Merge tag 'for-linus-Jun-21-2012' of git://oss.sgi.com/xfs/xfs