Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 21 Dec 2007 01:02:22 +0000 (17:02 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 21 Dec 2007 01:02:22 +0000 (17:02 -0800)
commit2b5baad1656d2e193308333636707ace4a2fff56
tree8c4e8ff9f3b79146fc81423b3384ea99d566e56a
parentfaa4877f023bafa35239d411b160955dc0629fe9
parent4743e0ec1217fd00f57461ebdd7979d31af18700
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