Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed3c4f8f authored by James Morris's avatar James Morris
Browse files

Merge tag 'keys-next-20140725' of...

Merge tag 'keys-next-20140725' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
parents 7d8b6c63 8f3438cc
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@


#define pr_fmt(fmt) "PKCS7key: "fmt
#define pr_fmt(fmt) "PKCS7key: "fmt
#include <linux/key.h>
#include <linux/key.h>
#include <linux/err.h>
#include <linux/key-type.h>
#include <linux/key-type.h>
#include <crypto/pkcs7.h>
#include <crypto/pkcs7.h>
#include <keys/user-type.h>
#include <keys/user-type.h>