Merge tag 'keys-next-20140725' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next

crypto/asymmetric_keys/pkcs7_key_type.c

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