Merge git://oss.sgi.com:8090/oss/git/xfs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 16 Jan 2006 06:18:04 +0000 (22:18 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 16 Jan 2006 06:18:04 +0000 (22:18 -0800)
commit4a8e4a270b89030bdeb09d2f8cef7cfe9a50e54d
tree6d4ca39c4e215023b80571ecf5d6a1700913418f
parent3f02d072d46bb409e8ca3cf16c0511f5c21adaf6
parent107a09c44b65d5e2a5313edfda91c498df3b3f2a
Merge git://oss.sgi.com:8090/oss/git/xfs-2.6
fs/xfs/quota/xfs_qm.c