Merge tag 'modsign-pkcs7-20150814' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJames Morris <jmorris@namei.org>
Tue, 25 Aug 2015 22:24:23 +0000 (08:24 +1000)
committerJames Morris <james.l.morris@oracle.com>
Tue, 25 Aug 2015 22:24:23 +0000 (08:24 +1000)

Trivial merge