tree c6d9f59ff6a08f8abd52f00cdb1a6cfdbd043814
parent 5874cfed0b04f53146f70a519a2371cea5f39178
parent 95389b08d93d5c06ec63ab49bd732b0069b7c35e
author Linus Torvalds <torvalds@linux-foundation.org> 1410539086 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1410539086 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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