Fixed merge problems

060

@@ -1,5 +1,5 @@
 #! /bin/sh
-# XFS QA Test No. 060
+# FS QA Test No. 060
 #
 # place holder for IRIX 060 test for xfsdump/xfsrestore multi streams
 #
@@ -50,10 +50,12 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common.rc
 . ./common.filter
 
-# real QA test starts here
-
 _notrun "Place holder for IRIX test 060"
 
+# real QA test starts here
+_supported_fs xfs
+_supported_os IRIX
+
 # success, all done
 status=0
 exit