Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Jun 2009 16:47:21 +0000 (09:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Jun 2009 16:47:21 +0000 (09:47 -0700)
commit4157fd85fc794bb7896b65c0cf686aa89d711d57
tree4ba3ebbea7bcaaa6d7a4ad1c5501c3c4a8d08745
parente7c4f03b839ba4b64ce0a7c71d71a8e1b086c840
parent1b17d766463d51904cb242f194a780737e5f73ef
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: prevent deadlock in xfs_qm_shake()
  xfs: fix overflow in xfs_growfs_data_private
  xfs: fix double unlock in xfs_swap_extents()