From: Linus Torvalds Date: Mon, 13 Feb 2012 22:19:45 +0000 (-0800) Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=19be13cfe37006bf90a61f6cb65ab8cb936099f3;p=openwrt%2Fstaging%2Fblogic.git 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() --- 19be13cfe37006bf90a61f6cb65ab8cb936099f3