]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 18 Dec 2007 16:03:32 +0000 (08:03 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 18 Dec 2007 16:03:32 +0000 (08:03 -0800)
commit64019535c9ea12095c1de7248ce2af371d04806b
tree24193356a3de7bb79742d20a00e8ec859c34a8ea
parent94e92bf0537595a822cfe7995c59b41e96236c89
parentf13a179c89cb45e3fa29562aaf1d6c392df9c04f
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] Put the correct offset in dirent d_off
  [XFS] Don't wait for pending I/Os when purging blocks beyond eof.