Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Aug 2009 20:39:30 +0000 (13:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Aug 2009 20:39:30 +0000 (13:39 -0700)
commitc58afec8b2576b121eced7b94eb94eaf4626bacc
tree092290136ab7cba84b8a6a5f53e2a73b9ef8318f
parent52dec22e739eec8f3a0154f768a599f5489048bd
parentbc990f5cb424cdca9dda866785d088e2c2110ecc
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: fix locking in xfs_iget_cache_hit