| commit | d834502e2fca9380a1579fecd134ef94c063b662 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jun 05 11:02:00 2016 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jun 05 11:02:00 2016 -0700 |
| tree | 5f180e522792facbe222c3c28b69df8003c93304 | |
| parent | eedf265aa003b4781de24cfed40a655a664457e6 [diff] | |
| parent | 4693fc734d675c5518ea9bd4c9623db45bc37402 [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