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)
commit96ea975bfeec855d119bb93df885d7f18452856a
treec6d9f59ff6a08f8abd52f00cdb1a6cfdbd043814
parent5874cfed0b04f53146f70a519a2371cea5f39178
parent95389b08d93d5c06ec63ab49bd732b0069b7c35e
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

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