projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5874cfe 95389b0)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Sep 2014 16:24:46 +0000 (09:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Sep 2014 16:24:46 +0000 (09:24 -0700)
Pull assoc array garbage collection fix from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  KEYS: Fix termination condition in assoc array garbage collection


Trivial merge
John Crispins staging tree