From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 Jun 2009 16:47:21 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: v2.6.30-rc8~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4157fd85fc794bb7896b65c0cf686aa89d711d57;p=pandora-kernel.git

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()
---

4157fd85fc794bb7896b65c0cf686aa89d711d57