| commit | 19be13cfe37006bf90a61f6cb65ab8cb936099f3 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 13 14:19:45 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 13 14:19:45 2012 -0800 |
| tree | 17b622ee141cb9fd6eda5417ec30f9ea21a29c14 | |
| parent | b14a29982ad90853cd71370af41adfd0009d7aa0 [diff] | |
| parent | 04da0c8196ac0b12fb6b84f4b7a51ad2fa56d869 [diff] |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs Two bugfixes in XFS for 3.3: one fix passes KMEM_SLEEP to kmem_realloc instead of 0, and the other resolves a possible deadlock in xfs quotas. * 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: use a normal shrinker for the dquot freelist xfs: pass KM_SLEEP flag to kmem_realloc() in xlog_recover_add_to_cnt_trans()