projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d61be4b ca4da5d)
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)
commitd4ec1f181f962f1cce3a61928d16e439e83882d1
treeb7c9ece891d364ee1f9fa08839de23096f903182tree | snapshot
parentd61be4b3f2684b6d76ef8c1d28ecdeb9bb20fa8fcommit | diff
parentca4da5dd1f99fe9c59f1709fb43e818b18ad20e0commit | diff
Merge branch 'for-linus' of git://git./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
Unnamed repository; edit this file 'description' to name the repository.