Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

This commit is contained in:
Linus Torvalds 2006-01-16 20:26:19 -08:00
commit 9bd5674c4a