summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-04-15 04:03:29 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2016-04-15 04:03:29 +0300
commit4c0b1c67c6250be73cedeac935b860e09de4420f (patch)
treedde83a92187b506a3f88b2e05568884d01cc339a /net
parent51d7b120418e99d6b3bf8df9eb3cc31e8171dee4 (diff)
parent58976eef9dc0318ef87bb81a6303b69d941d04bc (diff)
downloadlinux-4c0b1c67c6250be73cedeac935b860e09de4420f.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull keys bugfixes from James Morris: "Two bugfixes for Keys related code" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: ASN.1: fix open failure check on headername assoc_array: don't call compare_object() on a node
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions