Merge rsync://oss.sgi.com/git/xfs-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 22 Jun 2005 02:51:18 +0000 (19:51 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 22 Jun 2005 02:51:18 +0000 (19:51 -0700)
1  2 
fs/xfs/linux-2.6/xfs_linux.h

Simple merge