git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: faa4877 4743e0e)
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)
* '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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.