| commit | 4157fd85fc794bb7896b65c0cf686aa89d711d57 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 02 09:47:21 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 02 09:47:21 2009 -0700 |
| tree | 4ba3ebbea7bcaaa6d7a4ad1c5501c3c4a8d08745 | |
| parent | e7c4f03b839ba4b64ce0a7c71d71a8e1b086c840 [diff] | |
| parent | 1b17d766463d51904cb242f194a780737e5f73ef [diff] |
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()