Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Jul 2014 03:47:42 +0000 (17:47 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Jul 2014 03:47:42 +0000 (17:47 -1000)
commitc20ddc649990ecbe6813afb6e605415e2d083d68
treebf246f651fecb29ecae88b6edc7239d83ff7c435
parentd7b6e53e326e18f4124e121ee5b0a138a6bc9a1b
parentd68aab6b8f572406aa93b45ef6483934dd3b54a6
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()