]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Jul 2015 21:18:10 +0000 (14:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Jul 2015 21:18:10 +0000 (14:18 -0700)
commit44f0140a27de288063dd62319cb07aa76c4f6151
treeb7c9ece891d364ee1f9fa08839de23096f903182
parent4e8c5c638f8c328fb55cc7b77a53688922975f84
parent2da4ec19860c204c987fbc3ca195ca156b0b32fb
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull key fix from James Morris.

Fix memory leak.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  KEYS: ensure we free the assoc array edit if edit is valid