]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b8bc969 2d78912)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 5 Jun 2016 18:02:00 +0000 (11:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 5 Jun 2016 18:02:00 +0000 (11:02 -0700)
commitc1bdede098a1c27032255e4648c2f6fca3b5ac25
tree5f180e522792facbe222c3c28b69df8003c93304tree | snapshot
parentb8bc9698d2f4f4b5bb2345dd8f39f860afd8dfc4commit | diff
parent2d78912990ed005cd5194670d9b6b9194280634bcommit | diff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull key handling update from James Morris:
 "This alters a new keyctl function added in the current merge window to
  allow for a future extension planned for the next merge window"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  KEYS: Add placeholder for KDF usage with DH
Linux Kernel Source Tree.