tree 8c4e8ff9f3b79146fc81423b3384ea99d566e56a
parent faa4877f023bafa35239d411b160955dc0629fe9
parent 4743e0ec1217fd00f57461ebdd7979d31af18700
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1198198942 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1198198942 -0800

Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
  [XFS] Initialise current offset in xfs_file_readdir correctly
  [XFS] Fix mknod regression