projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7b6e53 d68aab6)
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)
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()


Trivial merge
John Crispins staging tree