tree 313b667c43ed5bc590212e8324662d39afff9412
parent 1d2ef5901483004d74947bbf78d5146c24038fe7
parent 2d2422aebc037095f77551119f795449d29befed
author Linus Torvalds <torvalds@linux-foundation.org> 1316041709 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1316041709 -0700

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

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: fix a use after free in xfs_end_io_direct_write