From: Linus Torvalds Date: Wed, 16 Jul 2014 03:47:42 +0000 (-1000) Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs X-Git-Tag: firefly_0821_release~176^2~3611 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c20ddc649990ecbe6813afb6e605415e2d083d68;p=firefly-linux-kernel-4.4.55.git Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-fs Pull quota fix from Jan Kara: "Fix locking of dquot shrinker" * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: quota: missing lock in dqcache_shrink_scan() --- c20ddc649990ecbe6813afb6e605415e2d083d68