Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev
authorBen Myers <bpm@sgi.com>
Thu, 13 Sep 2012 20:01:58 +0000 (15:01 -0500)
committerBen Myers <bpm@sgi.com>
Thu, 13 Sep 2012 20:01:58 +0000 (15:01 -0500)
commit681a33182ce024eaa967e195d7b8bae6922399f5
tree050deec13a89fa4c2149e17d5eba7b76e0acb3cf
parent871be1d8b5059a7c84e6f593eeb4ab10d0750b48
parent053126503b1947b295f15687ff4c32f27af6c98b
Merge branch 'master' of git://git./fs/xfs/xfstests-dev

Conflicts:
285
285.out
group

Moved '285: Test xfs projid32bit functionality a bit more extensively' to 287.
287
287.out
group