Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev

Conflicts:
	285
	285.out
	group

Moved '285: Test xfs projid32bit functionality a bit more extensively' to 287.
This commit is contained in:
Ben Myers
2012-09-13 15:01:58 -05:00
5 changed files with 201 additions and 27 deletions
+1
View File
@@ -405,3 +405,4 @@ deprecated
284 auto
285 auto rw
286 other
287 auto dump quota quick