From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 5 Jun 2016 18:02:00 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v4.7-rc2~2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d834502e2fca9380a1579fecd134ef94c063b662;p=linux-2.6-block.git

Merge branch 'for-linus' of git://git./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
---

d834502e2fca9380a1579fecd134ef94c063b662