Merge git://oss.sgi.com:8090/oss/git/xfs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Jan 2006 17:10:34 +0000 (09:10 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Jan 2006 17:10:34 +0000 (09:10 -0800)
commit9f5974c8734d83d4ab7096ed98136a82f41210d6
tree6f328555796bafefb74936ab68128aa84efd28b1
parenta2d823bf13efea4c859376f6e85c49cfbad7ab60
parentddae9c2ea79449beb00027cf77fca6dc489f2d15
Merge git://oss.sgi.com:8090/oss/git/xfs-2.6
fs/xfs/linux-2.6/xfs_ioctl.c
fs/xfs/linux-2.6/xfs_iops.c
fs/xfs/xfs_vnodeops.c