Merge branch 'master' of git://oss.sgi.com/xfs/xfs into for-linus
authorFelix Blyakher <felixb@sgi.com>
Sat, 13 Jun 2009 02:28:59 +0000 (21:28 -0500)
committerFelix Blyakher <felixb@sgi.com>
Sat, 13 Jun 2009 02:28:59 +0000 (21:28 -0500)

Trivial merge