Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev
authorBen Myers <bpm@sgi.com>
Wed, 8 Aug 2012 18:42:46 +0000 (13:42 -0500)
committerBen Myers <bpm@sgi.com>
Wed, 8 Aug 2012 18:42:46 +0000 (13:42 -0500)

Trivial merge