projects / profile / ivi / kernel-x86-ivi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b14a299 04da0c8)
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Feb 2012 22:19:45 +0000 (14:19 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Feb 2012 22:19:45 +0000 (14:19 -0800)
commit19be13cfe37006bf90a61f6cb65ab8cb936099f3
tree17b622ee141cb9fd6eda5417ec30f9ea21a29c14tree | snapshot
parentb14a29982ad90853cd71370af41adfd0009d7aa0commit | diff
parent04da0c8196ac0b12fb6b84f4b7a51ad2fa56d869commit | 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()
Domain: System / Uncategorized;