From: Eric Sandeen <sandeen@sandeen.net>
Date: Sun, 19 Apr 2009 20:48:54 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev
X-Git-Tag: v1.1.0~314
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ce0980fa782895d471a80e5ade29daeef9e8f14f;p=users%2Fhch%2Fxfstests-dev.git

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

ce0980fa782895d471a80e5ade29daeef9e8f14f
diff --cc 167
index fdbe749df,e63b25095..fdbe749df
mode 100644,100755..100755
--- a/167
+++ b/167