Merge git://oss.sgi.com:8090/oss/git/xfs-2.6
Linus Torvalds [Mon, 16 Jan 2006 06:18:04 +0000 (22:18 -0800)]
1  2 
fs/xfs/quota/xfs_qm.c

Simple merge