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

This commit is contained in:
Linus Torvalds 2005-11-25 09:33:53 -08:00
commit 4ad5bd2568
6 changed files with 31 additions and 38 deletions