]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: eedf265 4693fc7)
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)
commitd834502e2fca9380a1579fecd134ef94c063b662
tree5f180e522792facbe222c3c28b69df8003c93304tree
parenteedf265aa003b4781de24cfed40a655a664457e6commit | diff
parent4693fc734d675c5518ea9bd4c9623db45bc37402commit | 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
Ubuntu combined Linux kernel mirror