tree 3d5dba6982a074bcd5f3248c57679215e5f8b701
parent dc3d532a1792263ec9b26c1cbc7ce566056b5b1f
parent cf10e82bdc0d38d09dfaf46d0daf56136138ef3f
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1197310707 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1197310707 -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] Fix xfs_ichgtime()s broken usage of I_SYNC
  [XFS] Make xfsbufd threads freezable
  [XFS] revert to double-buffering readdir
  [XFS] Fix broken inode cluster setup.
  [XFS] Clear XBF_READ_AHEAD flag on I/O completion.
  [XFS] Fixed a few bugs in xfs_buf_associate_memory()
  [XFS] 971064 Various fixups for xfs_bulkstat().
  [XFS] Fix dbflush panic in xfs_qm_sync.